diff --git a/lib/capybara/poltergeist.rb b/lib/capybara/poltergeist.rb
index 14034a2..41dcb0a 100644
--- a/lib/capybara/poltergeist.rb
+++ b/lib/capybara/poltergeist.rb
@@ -13,8 +13,7 @@ module Capybara
     autoload :Inspector,       'capybara/poltergeist/inspector'
     autoload :Spawn,           'capybara/poltergeist/spawn'
     autoload :JSON,            'capybara/poltergeist/json'
-    autoload :Request,         'capybara/poltergeist/request'
-    autoload :Response,        'capybara/poltergeist/response'
+    autoload :NetworkTraffic,  'capybara/poltergeist/network_traffic'
 
     require 'capybara/poltergeist/errors'
   end
diff --git a/lib/capybara/poltergeist/browser.rb b/lib/capybara/poltergeist/browser.rb
index 94e26da..a55db8b 100644
--- a/lib/capybara/poltergeist/browser.rb
+++ b/lib/capybara/poltergeist/browser.rb
@@ -115,9 +115,9 @@ module Capybara::Poltergeist
       response = command 'networkTraffic'
 
       response.values.map do |event|
-        request = Request.new(event['request'])
+        request = NetworkTraffic::Request.new(event['request'])
         event['responseParts'].each do |response|
-          request.response_parts.push(Response.new(response))
+          request.response_parts.push(NetworkTraffic::Response.new(response))
         end
         request
       end
diff --git a/lib/capybara/poltergeist/network_traffic.rb b/lib/capybara/poltergeist/network_traffic.rb
new file mode 100644
index 0000000..1423254
--- /dev/null
+++ b/lib/capybara/poltergeist/network_traffic.rb
@@ -0,0 +1,6 @@
+module Capybara::Poltergeist
+  module NetworkTraffic
+    autoload :Request,  'capybara/poltergeist/network_traffic/request'
+    autoload :Response, 'capybara/poltergeist/network_traffic/response'
+  end
+end
diff --git a/lib/capybara/poltergeist/request.rb b/lib/capybara/poltergeist/network_traffic/request.rb
similarity index 88%
rename from lib/capybara/poltergeist/request.rb
rename to lib/capybara/poltergeist/network_traffic/request.rb
index 8e79276..fcf28d9 100644
--- a/lib/capybara/poltergeist/request.rb
+++ b/lib/capybara/poltergeist/network_traffic/request.rb
@@ -1,7 +1,5 @@
-module Capybara::Poltergeist
-
+module Capybara::Poltergeist::NetworkTraffic
   class Request
-
     attr_reader :response_parts
 
     def initialize(data)
@@ -24,7 +22,5 @@ module Capybara::Poltergeist
     def time
       @data['time'] && Time.parse(@data['time'])
     end
-
   end
-
 end
diff --git a/lib/capybara/poltergeist/response.rb b/lib/capybara/poltergeist/network_traffic/response.rb
similarity index 91%
rename from lib/capybara/poltergeist/response.rb
rename to lib/capybara/poltergeist/network_traffic/response.rb
index 1ee39fa..a944a5d 100644
--- a/lib/capybara/poltergeist/response.rb
+++ b/lib/capybara/poltergeist/network_traffic/response.rb
@@ -1,7 +1,5 @@
-module Capybara::Poltergeist
-
+module Capybara::Poltergeist::NetworkTraffic
   class Response
-
     def initialize(data)
       @data = data
     end
@@ -37,8 +35,6 @@ module Capybara::Poltergeist
     def time
       @data['time'] && Time.parse(@data['time'])
     end
-
   end
-
 end