diff --git a/lib/falcon/command/host.rb b/lib/falcon/command/host.rb
index 313c4946..352b788a 100644
--- a/lib/falcon/command/host.rb
+++ b/lib/falcon/command/host.rb
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../container/host'
+require_relative '../controller/host'
 require_relative '../configuration'
 
 require 'samovar'
@@ -46,7 +46,7 @@ def configuration(verbose = false)
 			end
 			
 			def controller
-				Container::Host.new(self)
+				Controller::Host.new(self)
 			end
 			
 			def call
diff --git a/lib/falcon/command/proxy.rb b/lib/falcon/command/proxy.rb
index d14fdd25..f7407b97 100644
--- a/lib/falcon/command/proxy.rb
+++ b/lib/falcon/command/proxy.rb
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../container/proxy'
+require_relative '../controller/proxy'
 require_relative 'paths'
 
 require 'samovar'
@@ -37,7 +37,7 @@ class Proxy < Samovar::Command
 			include Paths
 			
 			def controller
-				Container::Proxy.new(self)
+				Controller::Proxy.new(self)
 			end
 			
 			def container_class
diff --git a/lib/falcon/command/redirect.rb b/lib/falcon/command/redirect.rb
index be9acff1..3fbe68f4 100644
--- a/lib/falcon/command/redirect.rb
+++ b/lib/falcon/command/redirect.rb
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../container/redirect'
+require_relative '../controller/redirect'
 require_relative 'paths'
 
 require 'samovar'
@@ -38,7 +38,7 @@ class Redirect < Samovar::Command
 			include Paths
 			
 			def controller
-				Container::Redirect.new(self)
+				Controller::Redirect.new(self)
 			end
 			
 			def container_class
diff --git a/lib/falcon/command/serve.rb b/lib/falcon/command/serve.rb
index 0c0fac8b..8216f679 100644
--- a/lib/falcon/command/serve.rb
+++ b/lib/falcon/command/serve.rb
@@ -20,7 +20,7 @@
 
 require_relative '../server'
 require_relative '../endpoint'
-require_relative '../container/serve'
+require_relative '../controller/serve'
 
 require 'async/container'
 
@@ -114,7 +114,7 @@ def client
 			end
 			
 			def controller
-				Container::Serve.new(self)
+				Controller::Serve.new(self)
 			end
 			
 			def call
diff --git a/lib/falcon/command/virtual.rb b/lib/falcon/command/virtual.rb
index 7f17325c..76efe67d 100644
--- a/lib/falcon/command/virtual.rb
+++ b/lib/falcon/command/virtual.rb
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../container/virtual'
+require_relative '../controller/virtual'
 require_relative 'paths'
 
 require 'samovar'
@@ -38,7 +38,7 @@ class Virtual < Samovar::Command
 			include Paths
 			
 			def controller
-				Container::Virtual.new(self)
+				Controller::Virtual.new(self)
 			end
 			
 			def bind_secure
diff --git a/lib/falcon/container/host.rb b/lib/falcon/controller/host.rb
similarity index 98%
rename from lib/falcon/container/host.rb
rename to lib/falcon/controller/host.rb
index 71e95aa1..c7f64c15 100644
--- a/lib/falcon/container/host.rb
+++ b/lib/falcon/controller/host.rb
@@ -23,7 +23,7 @@
 require 'async/container/controller'
 
 module Falcon
-	module Container
+	module Controller
 		class Host < Async::Container::Controller
 			def initialize(command, **options)
 				@command = command
diff --git a/lib/falcon/container/proxy.rb b/lib/falcon/controller/proxy.rb
similarity index 99%
rename from lib/falcon/container/proxy.rb
rename to lib/falcon/controller/proxy.rb
index 7a72703d..64d80d04 100644
--- a/lib/falcon/container/proxy.rb
+++ b/lib/falcon/controller/proxy.rb
@@ -24,7 +24,7 @@
 require_relative '../middleware/proxy'
 
 module Falcon
-	module Container
+	module Controller
 		class Proxy < Serve
 			SERVER_CIPHERS = "EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5".freeze
 			DEFAULT_SESSION_ID = "falcon"
diff --git a/lib/falcon/container/redirect.rb b/lib/falcon/controller/redirect.rb
similarity index 99%
rename from lib/falcon/container/redirect.rb
rename to lib/falcon/controller/redirect.rb
index 207ae44a..58c3ff17 100644
--- a/lib/falcon/container/redirect.rb
+++ b/lib/falcon/controller/redirect.rb
@@ -24,7 +24,7 @@
 require_relative '../middleware/redirect'
 
 module Falcon
-	module Container
+	module Controller
 		class Redirect < Serve
 			def initialize(command, **options)
 				super(command, **options)
diff --git a/lib/falcon/container/serve.rb b/lib/falcon/controller/serve.rb
similarity index 99%
rename from lib/falcon/container/serve.rb
rename to lib/falcon/controller/serve.rb
index 98af82b9..08e75103 100644
--- a/lib/falcon/container/serve.rb
+++ b/lib/falcon/controller/serve.rb
@@ -23,7 +23,7 @@
 require 'async/container/controller'
 
 module Falcon
-	module Container
+	module Controller
 		class Serve < Async::Container::Controller
 			def initialize(command, **options)
 				@command = command
diff --git a/lib/falcon/container/virtual.rb b/lib/falcon/controller/virtual.rb
similarity index 99%
rename from lib/falcon/container/virtual.rb
rename to lib/falcon/controller/virtual.rb
index cd05e587..a505185f 100644
--- a/lib/falcon/container/virtual.rb
+++ b/lib/falcon/controller/virtual.rb
@@ -21,7 +21,7 @@
 require 'async/container/controller'
 
 module Falcon
-	module Container
+	module Controller
 		class Virtual < Async::Container::Controller
 			def initialize(command, **options)
 				@command = command