diff --git a/app/controllers/app.php b/app/Controllers/App.php
similarity index 96%
rename from app/controllers/app.php
rename to app/Controllers/App.php
index c9c7d737cb..6766ef3153 100644
--- a/app/controllers/app.php
+++ b/app/Controllers/App.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Controllers;
 
 use Sober\Controller\Controller;
 
diff --git a/app/controllers/front-page.php b/app/Controllers/FrontPage.php
similarity index 75%
rename from app/controllers/front-page.php
rename to app/Controllers/FrontPage.php
index 3a8dc214b1..243fa259e9 100644
--- a/app/controllers/front-page.php
+++ b/app/Controllers/FrontPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Controllers;
 
 use Sober\Controller\Controller;
 
diff --git a/composer.json b/composer.json
index 17ed12f9a8..362e41408c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     "composer/installers": "~1.0",
     "illuminate/support": "~5.6",
     "roots/sage-lib": "~9.0.1",
-    "soberwp/controller": "~9.0.0-beta.4"
+    "soberwp/controller": "~2.1.0"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^2.8.0",