diff --git a/lib/parliament/builder.rb b/lib/parliament/builder.rb
index f96b19e..5b158e5 100644
--- a/lib/parliament/builder.rb
+++ b/lib/parliament/builder.rb
@@ -2,7 +2,7 @@ module Parliament
   # Namespace for classes and modules that processes data from http requests.
   # @since 0.7.0
   module Builder
-    Dir[File.join(File.dirname(__FILE__), '../parliament/builder', '*.rb')].each { |builder| require builder }
-    # Currently just a namespace definition
+    require 'parliament/builder/base_response_builder'
+    require 'parliament/builder/ntriple_response_builder'
   end
 end
diff --git a/lib/parliament/decorator.rb b/lib/parliament/decorator.rb
index eb71430..038a768 100644
--- a/lib/parliament/decorator.rb
+++ b/lib/parliament/decorator.rb
@@ -1,7 +1,27 @@
 module Parliament
   # Decorator namespace
   module Decorator
-    # require all the decorators
-    Dir[File.join(File.dirname(__FILE__), '../parliament/decorator', '*.rb')].each { |decorator| require decorator }
+    require_relative '../parliament/decorator/constituency_area'
+    require_relative '../parliament/decorator/constituency_group'
+
+    require_relative '../parliament/decorator/contact_point'
+
+    require_relative '../parliament/decorator/gender'
+    require_relative '../parliament/decorator/gender_identity'
+
+    require_relative '../parliament/decorator/house'
+    require_relative '../parliament/decorator/house_incumbency'
+    require_relative '../parliament/decorator/house_seat'
+
+    require_relative '../parliament/decorator/incumbency'
+
+    require_relative '../parliament/decorator/party'
+    require_relative '../parliament/decorator/party_membership'
+
+    require_relative '../parliament/decorator/person'
+
+    require_relative '../parliament/decorator/postal_address'
+
+    require_relative '../parliament/decorator/seat_incumbency'
   end
 end
diff --git a/lib/parliament/request.rb b/lib/parliament/request.rb
index eac67fe..591604f 100644
--- a/lib/parliament/request.rb
+++ b/lib/parliament/request.rb
@@ -2,7 +2,7 @@ module Parliament
   # Namespace for classes and modules that handle http connections.
   # @since 0.7.0
   module Request
-    Dir[File.join(File.dirname(__FILE__), '../parliament/request', '*.rb')].each { |request| require request }
-    # Currently just a namespace definition
+    require 'parliament/request/base_request'
+    require 'parliament/request/url_request'
   end
 end
diff --git a/lib/parliament/version.rb b/lib/parliament/version.rb
index c9369a2..7e25613 100644
--- a/lib/parliament/version.rb
+++ b/lib/parliament/version.rb
@@ -1,3 +1,3 @@
 module Parliament
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.7.4'.freeze
 end