diff --git a/Gemfile.lock b/Gemfile.lock
index c07f1cd054..52ad231fb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
     arel (6.0.3)
     arel-helpers (2.3.0)
       activerecord (>= 3.1.0, < 6)
-    aruba (0.14.1)
+    aruba (0.14.2)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -95,7 +95,7 @@ GEM
     bcrypt (3.1.11)
     bit-struct (0.15.0)
     builder (3.2.2)
-    capybara (2.7.1)
+    capybara (2.8.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -263,7 +263,7 @@ GEM
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-rails (3.5.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
diff --git a/lib/msf/ui/web/comm.rb b/lib/msf/ui/web/comm.rb
index e4b6aaf335..b71f45fd77 100644
--- a/lib/msf/ui/web/comm.rb
+++ b/lib/msf/ui/web/comm.rb
@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/ui/text/bidirectional_pipe'
 module Msf
 module Ui
 module Web
@@ -83,7 +84,7 @@ module Comm
   end
 
   def self.create_session_pipe(session)
-    pipe = Rex::IO::BidirectionalPipe.new
+    pipe = Rex::Ui::BidirectionalPipe.new
 
     @session_pipes[session.id] = pipe
 
diff --git a/lib/msf/ui/web/console.rb b/lib/msf/ui/web/console.rb
index 9e81b63434..075c4c1a52 100644
--- a/lib/msf/ui/web/console.rb
+++ b/lib/msf/ui/web/console.rb
@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'rex/ui/text/bidirectional_pipe'
 module Msf
 module Ui
 module Web
@@ -18,7 +19,7 @@ class WebConsole
   attr_accessor :thread
 
   # Wrapper class in case we need to extend the pipe
-  class WebConsolePipe < Rex::IO::BidirectionalPipe
+  class WebConsolePipe < Rex::Ui::Text::BidirectionalPipe
     def prompting?
       false
     end
diff --git a/lib/msf/ui/web/driver.rb b/lib/msf/ui/web/driver.rb
index 5fcc1bdc27..1ac3583d3b 100644
--- a/lib/msf/ui/web/driver.rb
+++ b/lib/msf/ui/web/driver.rb
@@ -8,7 +8,7 @@ module Msf
 module Ui
 module Web
 
-require 'rex/io/bidirectional_pipe'
+require 'rex/ui/text/bidirectional_pipe'
 require 'msf/ui/web/console'
 
 
diff --git a/lib/rex/ui.rb b/lib/rex/ui.rb
index a0c9b03148..fa85649e4a 100644
--- a/lib/rex/ui.rb
+++ b/lib/rex/ui.rb
@@ -13,6 +13,7 @@ require 'rex/ui/text/input'
 require 'rex/ui/text/shell'
 require 'rex/ui/text/dispatcher_shell'
 require 'rex/ui/text/irb_shell'
+require 'rex/ui/text/bidirectional_pipe'
 
 require 'rex/text/color'
 require 'rex/text/table'
diff --git a/lib/rex/io/bidirectional_pipe.rb b/lib/rex/ui/text/bidirectional_pipe.rb
similarity index 98%
rename from lib/rex/io/bidirectional_pipe.rb
rename to lib/rex/ui/text/bidirectional_pipe.rb
index 0c553c0c9c..491bca9552 100644
--- a/lib/rex/io/bidirectional_pipe.rb
+++ b/lib/rex/ui/text/bidirectional_pipe.rb
@@ -1,6 +1,7 @@
 # -*- coding: binary -*-
 module Rex
-module IO
+module Ui
+module Text
 
 require 'rex/ui/text/output'
 require 'rex/ui/text/output/buffer'
@@ -155,3 +156,4 @@ end
 
 end
 end
+end