From d2f0c569b1040d526678a94f5cab6a6ffa51c0d0 Mon Sep 17 00:00:00 2001
From: gaurav dhameeja <gdhameeja@gmail.com>
Date: Thu, 15 Aug 2019 21:48:17 +0530
Subject: [PATCH 01/59] added auth dir in AuthCommand to move controllers to
 controllers/auth/

---
 masonite/commands/AuthCommand.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/masonite/commands/AuthCommand.py b/masonite/commands/AuthCommand.py
index 4af22e295..2b9a122e4 100644
--- a/masonite/commands/AuthCommand.py
+++ b/masonite/commands/AuthCommand.py
@@ -36,15 +36,15 @@ def handle(self):
 
         # move controllers
         shutil.copyfile(module_path + "/../snippets/auth/controllers/LoginController.py",
-                        os.getcwd() + "/app/http/controllers/LoginController.py")
+                        os.getcwd() + "/app/http/controllers/auth/LoginController.py")
         shutil.copyfile(module_path + "/../snippets/auth/controllers/RegisterController.py",
-                        os.getcwd() + "/app/http/controllers/RegisterController.py")
+                        os.getcwd() + "/app/http/controllers/auth/RegisterController.py")
         shutil.copyfile(module_path + "/../snippets/auth/controllers/HomeController.py",
-                        os.getcwd() + "/app/http/controllers/HomeController.py")
+                        os.getcwd() + "/app/http/controllers/auth/HomeController.py")
         shutil.copyfile(module_path + "/../snippets/auth/controllers/ConfirmController.py",
-                        os.getcwd() + "/app/http/controllers/ConfirmController.py")
+                        os.getcwd() + "/app/http/controllers/auth/ConfirmController.py")
         shutil.copyfile(module_path + "/../snippets/auth/controllers/PasswordController.py",
-                        os.getcwd() + "/app/http/controllers/PasswordController.py")
+                        os.getcwd() + "/app/http/controllers/auth/PasswordController.py")
         # move templates
         shutil.copytree(module_path + "/../snippets/auth/templates/auth",
                         os.getcwd() + "/resources/templates/auth")

From 63250a7ac5b848e08803b9c66098cc660a665fe1 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:19:43 -0400
Subject: [PATCH 02/59] added Python 3.8 and removed 3.4 from circle build

---
 .circleci/config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 722facb8b..e88ad5290 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,23 +7,23 @@ jobs:
         - checkout
         - run: make
         - run: make ci
-    python34:
+    python35:
       docker:
-        - image: circleci/python:3.4
+        - image: circleci/python:3.5
       steps:
         - checkout
         - run: make
         - run: make ci
-    python35:
+    python37:
       docker:
-        - image: circleci/python:3.5
+        - image: circleci/python:3.7
       steps:
         - checkout
         - run: make
         - run: make ci
-    python37:
+    python38:
       docker:
-        - image: circleci/python:3.7
+        - image: python/3.8.0b3-alpine3.10
       steps:
         - checkout
         - run: make
@@ -60,15 +60,15 @@ workflows:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^v*/
-      - python34:
+      - python35:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^v*/
-      - python35:
+      - python37:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^v*/
-      - python37:
+      - python38:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^v*/

From b6491ece134a0c665025ea8b2379150366236a8d Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:23:12 -0400
Subject: [PATCH 03/59] fixed 3.8 image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e88ad5290..39a5a3b40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
         - run: make ci
     python38:
       docker:
-        - image: python/3.8.0b3-alpine3.10
+        - image: python/3.8.0b3
       steps:
         - checkout
         - run: make

From d5e0a6bfc48d1da15ae71aca205f18b8bbaa4a00 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:30:44 -0400
Subject: [PATCH 04/59] added crednetials for 38

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39a5a3b40..384fe9705 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,10 @@ jobs:
         - run: make ci
     python38:
       docker:
-        - image: python/3.8.0b3
+        - image: python/3.8.0b3-alpine3.10
+            auth:
+              username: jmancuso9  # can specify string literal values
+              password: $DOCKERHUB_PASSWORD
       steps:
         - checkout
         - run: make

From de77c6b7a22f6580a050c117caf3edf016c35143 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:33:51 -0400
Subject: [PATCH 05/59] fixed indent

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 384fe9705..3178ef7a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,9 +24,9 @@ jobs:
     python38:
       docker:
         - image: python/3.8.0b3-alpine3.10
-            auth:
-              username: jmancuso9  # can specify string literal values
-              password: $DOCKERHUB_PASSWORD
+          auth:
+            username: jmancuso9  # can specify string literal values
+            password: $DOCKERHUB_PASSWORD
       steps:
         - checkout
         - run: make

From 0bd48365b35e3760a51c5c2b51c91e97c9d144a3 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:37:10 -0400
Subject: [PATCH 06/59] changed python image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3178ef7a7..0230419dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
         - run: make ci
     python38:
       docker:
-        - image: python/3.8.0b3-alpine3.10
+        - image: python/3.8.0b3-buster
           auth:
             username: jmancuso9  # can specify string literal values
             password: $DOCKERHUB_PASSWORD

From 20c87624328e2de073224e9fb41a50fa1708aced Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:40:35 -0400
Subject: [PATCH 07/59] fixed python tag

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0230419dc..8f83ccfee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
         - run: make ci
     python38:
       docker:
-        - image: python/3.8.0b3-buster
+        - image: python/python:3.8.0b3
           auth:
             username: jmancuso9  # can specify string literal values
             password: $DOCKERHUB_PASSWORD

From b1f9ebe85346757ca14aab589c5c0f958a9f2b2c Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 08:48:44 -0400
Subject: [PATCH 08/59] changed to circle image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f83ccfee..dfd45cfaf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
         - run: make ci
     python38:
       docker:
-        - image: python/python:3.8.0b3
+        - image: circleci/python:3.8.0b2-buster
           auth:
             username: jmancuso9  # can specify string literal values
             password: $DOCKERHUB_PASSWORD

From 68a13ea507bcb6f9be8140f09e2020fa5d40f4c9 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 09:02:44 -0400
Subject: [PATCH 09/59] fixed keyword issue for Python 3.8

---
 tests/core/test_managers_mail_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py
index e57a8e971..692f3f072 100644
--- a/tests/core/test_managers_mail_manager.py
+++ b/tests/core/test_managers_mail_manager.py
@@ -70,7 +70,7 @@ def test_manager_sets_driver(self):
         MailManager(self.app).driver('mailtrap')
 
     def test_manager_sets_driver_throws_driver_not_found_exception(self):
-        with self.assertRaises(DriverNotFound, message="Should raise DriverNotFound error"):
+        with self.assertRaises(DriverNotFound, "Should raise DriverNotFound error"):
             MailManager(self.app).driver('mailtrap')
 
     def test_drivers_are_resolvable_by_container(self):

From cd72ad2966f79a9b14c37f214dad6f7ef57504ff Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 17 Aug 2019 09:08:52 -0400
Subject: [PATCH 10/59] removed custom test message

---
 tests/core/test_managers_mail_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py
index 692f3f072..41ff1ff52 100644
--- a/tests/core/test_managers_mail_manager.py
+++ b/tests/core/test_managers_mail_manager.py
@@ -70,7 +70,7 @@ def test_manager_sets_driver(self):
         MailManager(self.app).driver('mailtrap')
 
     def test_manager_sets_driver_throws_driver_not_found_exception(self):
-        with self.assertRaises(DriverNotFound, "Should raise DriverNotFound error"):
+        with self.assertRaises(DriverNotFound):
             MailManager(self.app).driver('mailtrap')
 
     def test_drivers_are_resolvable_by_container(self):

From b67d86cd9096c1f397acc068473d61d45b549e54 Mon Sep 17 00:00:00 2001
From: gaurav dhameeja <gdhameeja@gmail.com>
Date: Fri, 30 Aug 2019 03:26:39 +0530
Subject: [PATCH 11/59] specified path in routers for controllers as auth.*

---
 masonite/commands/AuthCommand.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/masonite/commands/AuthCommand.py b/masonite/commands/AuthCommand.py
index 2b9a122e4..3b7f8808d 100644
--- a/masonite/commands/AuthCommand.py
+++ b/masonite/commands/AuthCommand.py
@@ -19,19 +19,19 @@ def handle(self):
         with open('routes/web.py', 'a') as f:
             # add all the routes
             f.write('\nROUTES = ROUTES + [\n    ')
-            f.write("Get().route('/login', 'LoginController@show').name('login'),\n    ")
-            f.write("Get().route('/logout', 'LoginController@logout').name('logout'),\n    ")
-            f.write("Post().route('/login', 'LoginController@store'),\n    ")
-            f.write("Get().route('/register', 'RegisterController@show').name('register'),\n    ")
-            f.write("Post().route('/register', 'RegisterController@store'),\n    ")
-            f.write("Get().route('/home', 'HomeController@show').name('home'),\n    ")
-            f.write("Get().route('/email/verify', 'ConfirmController@verify_show').name('verify'),\n    ")
-            f.write("Get().route('/email/verify/@id:signed', 'ConfirmController@confirm_email'),\n    ")
-            f.write("Get().route('/email/verify/@id:signed', 'ConfirmController@confirm_email'),\n    ")
-            f.write("Get().route('/password', 'PasswordController@forget').name('forgot.password'),\n    ")
-            f.write("Post().route('/password', 'PasswordController@send'),\n    ")
-            f.write("Get().route('/password/@token/reset', 'PasswordController@reset').name('password.reset'),\n    ")
-            f.write("Post().route('/password/@token/reset', 'PasswordController@update'),\n")
+            f.write("Get().route('/login', 'auth.LoginController@show').name('login'),\n    ")
+            f.write("Get().route('/logout', 'auth.LoginController@logout').name('logout'),\n    ")
+            f.write("Post().route('/login', 'auth.LoginController@store'),\n    ")
+            f.write("Get().route('/register', 'auth.RegisterController@show').name('register'),\n    ")
+            f.write("Post().route('/register', 'auth.RegisterController@store'),\n    ")
+            f.write("Get().route('/home', 'auth.HomeController@show').name('home'),\n    ")
+            f.write("Get().route('/email/verify', 'auth.ConfirmController@verify_show').name('verify'),\n    ")
+            f.write("Get().route('/email/verify/@id:signed', 'auth.ConfirmController@confirm_email'),\n    ")
+            f.write("Get().route('/email/verify/@id:signed', 'auth.ConfirmController@confirm_email'),\n    ")
+            f.write("Get().route('/password', 'auth.PasswordController@forget').name('forgot.password'),\n    ")
+            f.write("Post().route('/password', 'auth.PasswordController@send'),\n    ")
+            f.write("Get().route('/password/@token/reset', 'auth.PasswordController@reset').name('password.reset'),\n    ")
+            f.write("Post().route('/password/@token/reset', 'auth.PasswordController@update'),\n")
             f.write(']\n')
 
         # move controllers

From aacc3cf2336ec3d6f19a11d3f1873da30bb446f0 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 10:10:45 -0400
Subject: [PATCH 12/59] removed storage module from container

---
 masonite/exception_handler.py            | 15 +++++++++------
 masonite/helpers/__init__.py             |  2 +-
 masonite/helpers/structures.py           | 14 ++++++++++++++
 masonite/provider.py                     |  3 ++-
 masonite/providers/AppProvider.py        |  8 ++++----
 masonite/providers/SessionProvider.py    |  4 ++--
 masonite/providers/WhitenoiseProvider.py |  2 +-
 masonite/snippets/exception.html         |  2 +-
 tests/core/test_exception.py             |  1 +
 tests/core/test_service_provider.py      |  2 +-
 10 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/masonite/exception_handler.py b/masonite/exception_handler.py
index fe1841986..b46f1e6a6 100644
--- a/masonite/exception_handler.py
+++ b/masonite/exception_handler.py
@@ -15,6 +15,7 @@
 from masonite.request import Request
 from masonite.response import Response
 from masonite.view import View
+from masonite.helpers import config
 
 package_directory = os.path.dirname(os.path.realpath(__file__))
 
@@ -35,12 +36,14 @@ def __init__(self, app):
 
     def _register_static_files(self):
         """Register static files into the container."""
-        self._app.make('Storage').STATICFILES.update(
-            {
-                os.path.join(package_directory, 'snippets/exceptions'):
-                '_exceptions/'
-            }
-        )
+        storage = config('storage')
+        if storage:
+            storage.STATICFILES.update(
+                {
+                    os.path.join(package_directory, 'snippets/exceptions'):
+                    '_exceptions/'
+                }
+            )
 
     def load_exception(self, exception):
         """Load the exception thrown into this handler.
diff --git a/masonite/helpers/__init__.py b/masonite/helpers/__init__.py
index 84911d37c..5e2d102ff 100644
--- a/masonite/helpers/__init__.py
+++ b/masonite/helpers/__init__.py
@@ -4,6 +4,6 @@
 from .Extendable import Extendable
 from .time import cookie_expire_time
 from .optional import Optional as optional
-from .structures import config, Dot
+from .structures import config, Dot, load
 from .migrations import has_unmigrated_migrations
 from orator.support.collection import Collection as collect
diff --git a/masonite/helpers/structures.py b/masonite/helpers/structures.py
index fbaa7c964..cda34bd58 100644
--- a/masonite/helpers/structures.py
+++ b/masonite/helpers/structures.py
@@ -167,3 +167,17 @@ def config(path, default=''):
         mixed
     """
     return Dot().locate('config.' + path, default)
+
+def load(path, default=''):
+    """Used to fetch a value from a configuration file
+
+    Arguments:
+        path {string} -- The search path using dot notation of the value to get
+
+    Keyword Arguments:
+        default {str} -- The default value if not value and be found (default: {''})
+
+    Returns:
+        mixed
+    """
+    return Dot().locate(path, default)
diff --git a/masonite/provider.py b/masonite/provider.py
index 512456f54..ed4eba6e4 100644
--- a/masonite/provider.py
+++ b/masonite/provider.py
@@ -88,7 +88,8 @@ def assets(self, assets):
         Arguments:
             assets {dict} -- A dictionary of assets to add
         """
-        self.app.make('Storage').STATICFILES.update(assets)
+        
+        self.app.make('staticfiles').update(assets)
 
     def publishes(self, dictionary, tag=None):
         self._publishes.update(dictionary)
diff --git a/masonite/providers/AppProvider.py b/masonite/providers/AppProvider.py
index b64fcfb90..b46e2df55 100644
--- a/masonite/providers/AppProvider.py
+++ b/masonite/providers/AppProvider.py
@@ -25,15 +25,14 @@
 
 from masonite.managers import AuthManager
 from masonite.drivers import AuthCookieDriver, AuthJwtDriver
-
+from masonite.helpers import load
 
 class AppProvider(ServiceProvider):
 
     def register(self):
-        from routes import web
         self.app.bind('HookHandler', Hook(self.app))
-        self.app.bind('WebRoutes', flatten_routes(web.ROUTES))
-        self.app.bind('Storage', config('storage'))
+        self.app.bind('WebRoutes', flatten_routes(load('routes.web.routes')))
+        # self.app.bind('Storage', config('storage'))
         self.app.bind('Route', Route())
         self.app.bind('Request', Request())
         self.app.simple(Response(self.app))
@@ -46,6 +45,7 @@ def register(self):
         self.app.bind('RouteMiddleware', config('middleware.route_middleware'))
         self.app.bind('HttpMiddleware', config('middleware.http_middleware'))
         self.app.bind('Auth', Auth)
+        self.app.bind('staticfiles', config('storage.staticfiles', {}))
 
         # Insert Commands
         self._load_commands()
diff --git a/masonite/providers/SessionProvider.py b/masonite/providers/SessionProvider.py
index 631d27853..0f06cb051 100644
--- a/masonite/providers/SessionProvider.py
+++ b/masonite/providers/SessionProvider.py
@@ -11,8 +11,8 @@
 class SessionProvider(ServiceProvider):
 
     def register(self):
-        from config import session
-        self.app.bind('SessionConfig', session)
+        # from config import session
+        # self.app.bind('SessionConfig', session)
         self.app.bind('SessionMemoryDriver', SessionMemoryDriver)
         self.app.bind('SessionCookieDriver', SessionCookieDriver)
         self.app.bind('SessionManager', SessionManager(self.app))
diff --git a/masonite/providers/WhitenoiseProvider.py b/masonite/providers/WhitenoiseProvider.py
index de3831cfb..3630185f4 100644
--- a/masonite/providers/WhitenoiseProvider.py
+++ b/masonite/providers/WhitenoiseProvider.py
@@ -18,5 +18,5 @@ def boot(self):
         self.app.bind('WSGI', WhiteNoise(
             self.app.make('WSGI'), root=self.app.make('Application').STATIC_ROOT, autorefresh=application.DEBUG))
 
-        for location, alias in self.app.make('Storage').STATICFILES.items():
+        for location, alias in self.app.make('staticfiles').items():
             self.app.make('WSGI').add_files(location, prefix=alias)
diff --git a/masonite/snippets/exception.html b/masonite/snippets/exception.html
index 1a703edb8..f07a59145 100644
--- a/masonite/snippets/exception.html
+++ b/masonite/snippets/exception.html
@@ -263,7 +263,7 @@ <h3 id="Container" style="margin-top:15px;margin-bottom:15px;">Container</h3>
             </div>
             <div class="col-md-10">
                 <div>
-                    {% for directory in app.make('Storage').STATICFILES %}
+                    {% for directory in app.make('staticfiles') %}
                         <p>
                             {{ directory}}
                         </p>
diff --git a/tests/core/test_exception.py b/tests/core/test_exception.py
index 478c2053a..685237e95 100644
--- a/tests/core/test_exception.py
+++ b/tests/core/test_exception.py
@@ -40,6 +40,7 @@ def setUp(self):
         self.app.bind('ExceptionHandler', ExceptionHandler(self.app))
         self.app.bind('HookHandler', Hook(self.app))
         self.app.bind('Request', Request(generate_wsgi()).load_app(self.app))
+        self.app.bind('staticfiles', {})
         self.app.bind('ExceptionAttributeErrorHandler', MockExceptionHandler)
 
     def test_exception_renders_view(self):
diff --git a/tests/core/test_service_provider.py b/tests/core/test_service_provider.py
index a69faefa9..14f36d7b2 100644
--- a/tests/core/test_service_provider.py
+++ b/tests/core/test_service_provider.py
@@ -103,7 +103,7 @@ def test_can_load_migrations_into_container(self):
         self.assertEqual(len(self.app.collect('*MigrationDirectory')), 2)
 
     def test_can_load_assets_into_container(self):
-        self.assertEqual(self.app.make('Storage').STATICFILES['storage/static'], '/some/location')
+        self.assertEqual(self.app.make('staticfiles')['storage/static'], '/some/location')
 
     def test_can_load_commands_into_container(self):
         self.assertTrue(self.app.make('Mock1Command'))

From 95ceca3c521daf1f6c21e1e11e61d6aa3d1dc807 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 10:18:09 -0400
Subject: [PATCH 13/59] removed cache config

---
 masonite/app.py                           |  2 ++
 masonite/drivers/cache/CacheDiskDriver.py |  4 +--
 masonite/providers/CacheProvider.py       | 10 +++---
 masonite/providers/SessionProvider.py     |  6 ++--
 storage/compiled/style.css                | 41 -----------------------
 tests/core/test_cache.py                  |  2 +-
 tests/core/test_view.py                   |  4 +--
 7 files changed, 15 insertions(+), 54 deletions(-)
 delete mode 100644 storage/compiled/style.css

diff --git a/masonite/app.py b/masonite/app.py
index 5f770335c..ae18a7e73 100644
--- a/masonite/app.py
+++ b/masonite/app.py
@@ -39,6 +39,8 @@ def bind(self, name, class_obj):
         Returns:
             self
         """
+        if inspect.ismodule(class_obj):
+            raise StrictContainerException("Cannot bind module '{}' with key '{}' into the container".format(class_obj, name))
         if self.strict and name in self.providers:
             raise StrictContainerException(
                 'You cannot override a key inside a strict container')
diff --git a/masonite/drivers/cache/CacheDiskDriver.py b/masonite/drivers/cache/CacheDiskDriver.py
index 4ea93fe77..09e1ada10 100644
--- a/masonite/drivers/cache/CacheDiskDriver.py
+++ b/masonite/drivers/cache/CacheDiskDriver.py
@@ -7,7 +7,7 @@
 from masonite.app import App
 from masonite.contracts import CacheContract
 from masonite.drivers import BaseCacheDriver
-
+from masonite.helpers import config
 
 class CacheDiskDriver(CacheContract, BaseCacheDriver):
     """Class for the cache disk driver."""
@@ -19,7 +19,7 @@ def __init__(self, app: App):
             CacheConfig {config.cache} -- Cache configuration module.
             Application {config.application} -- Application configuration module.
         """
-        self.config = app.make('CacheConfig')
+        self.config = config('cache')
         self.appconfig = app.make('Application')
         self.cache_forever = None
 
diff --git a/masonite/providers/CacheProvider.py b/masonite/providers/CacheProvider.py
index 838189272..4938cdd75 100644
--- a/masonite/providers/CacheProvider.py
+++ b/masonite/providers/CacheProvider.py
@@ -4,19 +4,19 @@
 from masonite.drivers import CacheDiskDriver, CacheRedisDriver
 from masonite.managers import CacheManager
 from masonite.provider import ServiceProvider
-
+from masonite.helpers import config
 
 class CacheProvider(ServiceProvider):
 
     wsgi = False
 
     def register(self):
-        from config import cache
-        self.app.bind('CacheConfig', cache)
+        # from config import cache
+        # self.app.bind('CacheConfig', cache)
         self.app.bind('CacheDiskDriver', CacheDiskDriver)
         self.app.bind('CacheRedisDriver', CacheRedisDriver)
         self.app.bind('CacheManager', CacheManager(self.app))
 
     def boot(self, cache: CacheManager):
-        self.app.bind('Cache', cache.driver(self.app.make('CacheConfig').DRIVER))
-        self.app.swap(Cache, cache.driver(self.app.make('CacheConfig').DRIVER))
+        self.app.bind('Cache', cache.driver(config('cache').DRIVER))
+        self.app.swap(Cache, cache.driver(config('cache').DRIVER))
diff --git a/masonite/providers/SessionProvider.py b/masonite/providers/SessionProvider.py
index 0f06cb051..bf6e4966c 100644
--- a/masonite/providers/SessionProvider.py
+++ b/masonite/providers/SessionProvider.py
@@ -6,7 +6,7 @@
 from masonite.view import View
 from masonite.request import Request
 from masonite import Session
-
+from masonite.helpers import config
 
 class SessionProvider(ServiceProvider):
 
@@ -18,8 +18,8 @@ def register(self):
         self.app.bind('SessionManager', SessionManager(self.app))
 
     def boot(self, request: Request, view: View, session: SessionManager):
-        self.app.bind('Session', session.driver(self.app.make('SessionConfig').DRIVER))
-        self.app.swap(Session, session.driver(self.app.make('SessionConfig').DRIVER))
+        self.app.bind('Session', session.driver(config('session').DRIVER))
+        self.app.swap(Session, session.driver(config('session').DRIVER))
         request.session = self.app.make('Session')
 
         view.share({
diff --git a/storage/compiled/style.css b/storage/compiled/style.css
deleted file mode 100644
index 831a52d9b..000000000
--- a/storage/compiled/style.css
+++ /dev/null
@@ -1,41 +0,0 @@
-html, body {
-  background-color: #fff;
-  color: #636b6f;
-  font-family: "Raleway", sans-serif;
-  font-weight: 100;
-  height: 100vh;
-  margin: 0; }
-
-.full-height {
-  height: 100vh; }
-
-.flex-center {
-  align-items: center;
-  display: flex;
-  justify-content: center; }
-
-.position-ref {
-  position: relative; }
-
-.top-right {
-  position: absolute;
-  right: 10px;
-  top: 18px; }
-
-.content {
-  text-align: center; }
-
-.title {
-  font-size: 84px; }
-
-.links > a {
-  color: #636b6f;
-  padding: 0 25px;
-  font-size: 12px;
-  font-weight: 600;
-  letter-spacing: .1rem;
-  text-decoration: none;
-  text-transform: uppercase; }
-
-.m-b-md {
-  margin-bottom: 30px; }
diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py
index e549f516a..f822b2583 100644
--- a/tests/core/test_cache.py
+++ b/tests/core/test_cache.py
@@ -16,7 +16,7 @@ class TestCache(unittest.TestCase):
 
     def setUp(self):
         self.app = App()
-        self.app.bind('CacheConfig', cache)
+        # self.app.bind('CacheConfig', cache)
         self.app.bind('CacheDiskDriver', CacheDiskDriver)
         self.app.bind('CacheRedisDriver', CacheRedisDriver)
         self.app.bind('CacheManager', CacheManager(self.app))
diff --git a/tests/core/test_view.py b/tests/core/test_view.py
index 05c6d77e7..1e82a11e2 100644
--- a/tests/core/test_view.py
+++ b/tests/core/test_view.py
@@ -167,7 +167,7 @@ def _filter_slug(item):
 
     def test_view_cache_caches_files(self):
 
-        self.container.bind('CacheConfig', cache)
+        # self.container.bind('CacheConfig', cache)
         self.container.bind('CacheDiskDriver', CacheDiskDriver)
         self.container.bind('CacheManager', CacheManager(self.container))
         self.container.bind('Application', self.container)
@@ -197,7 +197,7 @@ def test_view_cache_caches_files(self):
         self.assertEqual(view('test_cache', {'test': 'macho'}).cache_for('1', 'second').rendered_template, 'macho')
 
     def test_cache_throws_exception_with_incorrect_cache_type(self):
-        self.container.bind('CacheConfig', cache)
+        # self.container.bind('CacheConfig', cache)
         self.container.bind('CacheDiskDriver', CacheDiskDriver)
         self.container.bind('CacheManager', CacheManager(self.container))
         self.container.bind('Application', self.container)

From 8c05d5a376bd3dd6d16e5b453ac9ccc56fa4956d Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 10:21:19 -0400
Subject: [PATCH 14/59] removed storage config from being imported

---
 masonite/drivers/upload/UploadS3Driver.py |  4 ++--
 masonite/providers/UploadProvider.py      | 10 +++++-----
 tests/core/test_upload_manager.py         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/masonite/drivers/upload/UploadS3Driver.py b/masonite/drivers/upload/UploadS3Driver.py
index ef027f209..8966fcda4 100644
--- a/masonite/drivers/upload/UploadS3Driver.py
+++ b/masonite/drivers/upload/UploadS3Driver.py
@@ -7,7 +7,7 @@
 from masonite.exceptions import DriverLibraryNotFound
 from masonite.managers import UploadManager
 from masonite.app import App
-
+from masonite.helpers import config
 
 class UploadS3Driver(BaseUploadDriver, UploadContract):
     """Amazon S3 Upload driver."""
@@ -20,7 +20,7 @@ def __init__(self, upload: UploadManager, app: App):
             StorageConfig {config.storage} -- Storage configuration.
         """
         self.upload = upload
-        self.config = app.make('StorageConfig')
+        self.config = config('storage')
 
     def store(self, fileitem, filename=None, location=None):
         """Store the file into Amazon S3 server.
diff --git a/masonite/providers/UploadProvider.py b/masonite/providers/UploadProvider.py
index 30651c8fa..ff3cfbf4e 100644
--- a/masonite/providers/UploadProvider.py
+++ b/masonite/providers/UploadProvider.py
@@ -6,22 +6,22 @@
 from masonite.provider import ServiceProvider
 from masonite.view import View
 from masonite import Upload
-
+from masonite.helpers import config
 
 class UploadProvider(ServiceProvider):
 
     wsgi = False
 
     def register(self):
-        from config import storage
-        self.app.bind('StorageConfig', storage)
+        # from config import storage
+        # self.app.bind('StorageConfig', storage)
         self.app.bind('UploadDiskDriver', UploadDiskDriver)
         self.app.bind('UploadS3Driver', UploadS3Driver)
         self.app.bind('UploadManager', UploadManager(self.app))
 
     def boot(self, manager: UploadManager, view: View):
-        self.app.bind('Upload', manager.driver(self.app.make('StorageConfig').DRIVER))
-        self.app.swap(Upload, manager.driver(self.app.make('StorageConfig').DRIVER))
+        self.app.bind('Upload', manager.driver(config('storage').DRIVER))
+        self.app.swap(Upload, manager.driver(config('storage').DRIVER))
         view.share(
             {
                 'static': static,
diff --git a/tests/core/test_upload_manager.py b/tests/core/test_upload_manager.py
index c02bcd03c..ca20e915a 100644
--- a/tests/core/test_upload_manager.py
+++ b/tests/core/test_upload_manager.py
@@ -35,7 +35,7 @@ def setUp(self):
         self.app = App()
         self.app.bind('Container', self.app)
         self.app.bind('Test', object)
-        self.app.bind('StorageConfig', storage)
+        # self.app.bind('StorageConfig', storage)
         self.app.bind('UploadDiskDriver', UploadDiskDriver)
         self.app.bind('UploadS3Driver', UploadS3Driver)
         self.app.bind('Application', application)
@@ -64,7 +64,7 @@ def test_upload_manager_changes_accepted_files(self):
     def test_upload_manager_raises_driver_not_found_error(self):
         self.app = App()
         self.app.bind('Test', object)
-        self.app.bind('StorageConfig', storage)
+        # self.app.bind('StorageConfig', storage)
 
         with self.assertRaises(DriverNotFound):
             self.assertIsNone(self.app.bind(
@@ -169,7 +169,7 @@ def setUp(self):
             self.app.bind('Container', self.app)
 
             self.app.bind('Application', application)
-            self.app.bind('StorageConfig', storage)
+            # self.app.bind('StorageConfig', storage)
             self.app.bind('UploadDiskDriver', UploadDiskDriver)
             self.app.bind('UploadManager', UploadManager(self.app))
             self.app.bind('Upload', UploadManager(self.app))

From 0bfe5915f164cef7188407d9a628310ae0b464ef Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 10:34:04 -0400
Subject: [PATCH 15/59] removed application config from container

---
 masonite/drivers/cache/CacheDiskDriver.py                | 3 ++-
 masonite/exception_handler.py                            | 1 +
 masonite/managers/AuthManager.py                         | 2 +-
 masonite/managers/BroadcastManager.py                    | 2 +-
 masonite/managers/CacheManager.py                        | 2 +-
 masonite/managers/MailManager.py                         | 2 +-
 masonite/managers/Manager.py                             | 4 ++--
 masonite/managers/QueueManager.py                        | 2 +-
 masonite/managers/SessionManager.py                      | 2 +-
 masonite/managers/StorageManager.py                      | 2 +-
 masonite/managers/UploadManager.py                       | 2 +-
 masonite/providers/WhitenoiseProvider.py                 | 2 +-
 masonite/snippets/auth/controllers/ConfirmController.py  | 8 ++++----
 masonite/snippets/auth/controllers/LoginController.py    | 4 ++--
 masonite/snippets/auth/controllers/PasswordController.py | 7 +++----
 masonite/snippets/exception.html                         | 2 +-
 masonite/testsuite/TestSuite.py                          | 1 -
 tests/core/test_auth.py                                  | 1 -
 tests/core/test_cache.py                                 | 1 -
 tests/core/test_exception.py                             | 3 +--
 tests/core/test_middleware.py                            | 1 -
 tests/core/test_providers.py                             | 1 -
 tests/core/test_requests.py                              | 1 -
 tests/core/test_upload_manager.py                        | 2 --
 wsgi.py                                                  | 1 -
 25 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/masonite/drivers/cache/CacheDiskDriver.py b/masonite/drivers/cache/CacheDiskDriver.py
index 09e1ada10..a71e4374c 100644
--- a/masonite/drivers/cache/CacheDiskDriver.py
+++ b/masonite/drivers/cache/CacheDiskDriver.py
@@ -9,6 +9,7 @@
 from masonite.drivers import BaseCacheDriver
 from masonite.helpers import config
 
+
 class CacheDiskDriver(CacheContract, BaseCacheDriver):
     """Class for the cache disk driver."""
 
@@ -20,7 +21,7 @@ def __init__(self, app: App):
             Application {config.application} -- Application configuration module.
         """
         self.config = config('cache')
-        self.appconfig = app.make('Application')
+        self.appconfig = config('application')
         self.cache_forever = None
 
     def store(self, key, value, extension=".txt", location=None):
diff --git a/masonite/exception_handler.py b/masonite/exception_handler.py
index b46f1e6a6..5959915cf 100644
--- a/masonite/exception_handler.py
+++ b/masonite/exception_handler.py
@@ -105,6 +105,7 @@ def handle(self, _):
                                                    'stacktrace': traceback.extract_tb(sys.exc_info()[2]) + last_stacktrace + second_to_last_stacktrace,
                                                    'second_to_last': second_to_last_stacktrace,
                                                    'app': self._app,
+                                                   'providers': config('providers.providers', []),
                                                    'enumerate': enumerate,
                                                    'open': open,
                                                    'platform': platform
diff --git a/masonite/managers/AuthManager.py b/masonite/managers/AuthManager.py
index bbbcc9049..f3b28de38 100644
--- a/masonite/managers/AuthManager.py
+++ b/masonite/managers/AuthManager.py
@@ -10,7 +10,7 @@ class AuthManager(Manager):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'AuthConfig'
+    config = 'auth'
     driver_prefix = 'Auth'
 
 
diff --git a/masonite/managers/BroadcastManager.py b/masonite/managers/BroadcastManager.py
index 6e938474b..075162cf0 100644
--- a/masonite/managers/BroadcastManager.py
+++ b/masonite/managers/BroadcastManager.py
@@ -11,7 +11,7 @@ class BroadcastManager(Manager, BroadcastManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'BroadcastConfig'
+    config = 'broadcast'
     driver_prefix = 'Broadcast'
 
 
diff --git a/masonite/managers/CacheManager.py b/masonite/managers/CacheManager.py
index 1f045df3d..e73a50d2a 100644
--- a/masonite/managers/CacheManager.py
+++ b/masonite/managers/CacheManager.py
@@ -11,7 +11,7 @@ class CacheManager(Manager, CacheManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'CacheConfig'
+    config = 'cache'
     driver_prefix = 'Cache'
 
 
diff --git a/masonite/managers/MailManager.py b/masonite/managers/MailManager.py
index b5e10bf74..687fa5ccc 100644
--- a/masonite/managers/MailManager.py
+++ b/masonite/managers/MailManager.py
@@ -11,7 +11,7 @@ class MailManager(Manager, MailManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'MailConfig'
+    config = 'mail'
     driver_prefix = 'Mail'
 
     def helper(self):
diff --git a/masonite/managers/Manager.py b/masonite/managers/Manager.py
index 0288e16ca..2bed22ff2 100644
--- a/masonite/managers/Manager.py
+++ b/masonite/managers/Manager.py
@@ -7,7 +7,7 @@
                                  UnacceptableDriverType)
 
 from masonite.app import App
-
+from masonite.helpers import config
 
 class Manager:
     """Base Manager Class."""
@@ -64,7 +64,7 @@ def create_driver(self, driver=None):
         """
 
         if driver in (None, 'default'):
-            driver = self.container.make(self.config).DRIVER.capitalize()
+            driver = config('{}.driver'.format(self.config)).capitalize()
         else:
             if isinstance(driver, str):
                 driver = driver.capitalize()
diff --git a/masonite/managers/QueueManager.py b/masonite/managers/QueueManager.py
index feb0c0248..18e2952c8 100644
--- a/masonite/managers/QueueManager.py
+++ b/masonite/managers/QueueManager.py
@@ -11,7 +11,7 @@ class QueueManager(Manager, QueueManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'QueueConfig'
+    config = 'queue'
     driver_prefix = 'Queue'
 
 
diff --git a/masonite/managers/SessionManager.py b/masonite/managers/SessionManager.py
index 12c56c6c9..fcfaae658 100644
--- a/masonite/managers/SessionManager.py
+++ b/masonite/managers/SessionManager.py
@@ -11,7 +11,7 @@ class SessionManager(Manager, SessionManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'SessionConfig'
+    config = 'session'
     driver_prefix = 'Session'
 
 
diff --git a/masonite/managers/StorageManager.py b/masonite/managers/StorageManager.py
index 851ef2f90..0c1e9f8b7 100644
--- a/masonite/managers/StorageManager.py
+++ b/masonite/managers/StorageManager.py
@@ -11,7 +11,7 @@ class StorageManager(Manager, StorageManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'StorageConfig'
+    config = 'storage'
     driver_prefix = 'Storage'
 
 
diff --git a/masonite/managers/UploadManager.py b/masonite/managers/UploadManager.py
index 39d703d47..70df597cd 100644
--- a/masonite/managers/UploadManager.py
+++ b/masonite/managers/UploadManager.py
@@ -11,7 +11,7 @@ class UploadManager(Manager, UploadManagerContract):
         Manager {masonite.managers.Manager} -- The base Manager class.
     """
 
-    config = 'StorageConfig'
+    config = 'storage'
     driver_prefix = 'Upload'
 
 
diff --git a/masonite/providers/WhitenoiseProvider.py b/masonite/providers/WhitenoiseProvider.py
index 3630185f4..eb52c1f21 100644
--- a/masonite/providers/WhitenoiseProvider.py
+++ b/masonite/providers/WhitenoiseProvider.py
@@ -16,7 +16,7 @@ def boot(self):
         """Wrap the WSGI server in a whitenoise container."""
         from config import application
         self.app.bind('WSGI', WhiteNoise(
-            self.app.make('WSGI'), root=self.app.make('Application').STATIC_ROOT, autorefresh=application.DEBUG))
+            self.app.make('WSGI'), root=config('application.static_root'), autorefresh=application.DEBUG))
 
         for location, alias in self.app.make('staticfiles').items():
             self.app.make('WSGI').add_files(location, prefix=alias)
diff --git a/masonite/snippets/auth/controllers/ConfirmController.py b/masonite/snippets/auth/controllers/ConfirmController.py
index e8fca645b..fac737f45 100644
--- a/masonite/snippets/auth/controllers/ConfirmController.py
+++ b/masonite/snippets/auth/controllers/ConfirmController.py
@@ -6,7 +6,7 @@
 from masonite.managers import MailManager
 from masonite.request import Request
 from masonite.view import View
-
+from masonite.helpers import config
 from app.User import User
 
 
@@ -28,7 +28,7 @@ def verify_show(self, request: Request, view: View, auth: Auth):
         Returns:
             [type] -- [description]
         """
-        return view.render('auth/verify', {'app': request.app().make('Application'), 'Auth': auth})
+        return view.render('auth/verify', {'app': config('application'), 'Auth': auth})
 
     def confirm_email(self, request: Request, view: View, auth: Auth):
         """Confirm User email and show the correct response.
@@ -58,9 +58,9 @@ def confirm_email(self, request: Request, view: View, auth: Auth):
                         user.verified_at = datetime.datetime.now()
                         user.save()
 
-                        return view.render('auth/confirm', {'app': request.app().make('Application'), 'Auth': auth})
+                        return view.render('auth/confirm', {'app': config('application'), 'Auth': auth})
 
-        return view.render('auth/error', {'app': request.app().make('Application'), 'Auth': auth})
+        return view.render('auth/error', {'app': config('application'), 'Auth': auth})
 
     def send_verify_email(self, manager: MailManager, request: Request):
         user = request.user()
diff --git a/masonite/snippets/auth/controllers/LoginController.py b/masonite/snippets/auth/controllers/LoginController.py
index 8f6144c3e..452fbe525 100644
--- a/masonite/snippets/auth/controllers/LoginController.py
+++ b/masonite/snippets/auth/controllers/LoginController.py
@@ -3,7 +3,7 @@
 from masonite.auth import Auth
 from masonite.request import Request
 from masonite.view import View
-
+from masonite.helpers import config
 
 class LoginController:
     """Login Form Controller."""
@@ -25,7 +25,7 @@ def show(self, request: Request, view: View, auth: Auth):
         """
         if request.user():
             return request.redirect('/home')
-        return view.render('auth/login', {'app': request.app().make('Application'), 'Auth': auth})
+        return view.render('auth/login', {'app': config('application'), 'Auth': auth})
 
     def store(self, request: Request, auth: Auth):
         """Login the user.
diff --git a/masonite/snippets/auth/controllers/PasswordController.py b/masonite/snippets/auth/controllers/PasswordController.py
index 77ecc5ec7..ebcf76250 100644
--- a/masonite/snippets/auth/controllers/PasswordController.py
+++ b/masonite/snippets/auth/controllers/PasswordController.py
@@ -4,10 +4,9 @@
 
 from masonite import env, Mail, Session
 from masonite.auth import Auth
-from masonite.helpers import password as bcrypt_password
+from masonite.helpers import config, password as bcrypt_password
 from masonite.request import Request
 from masonite.view import View
-
 from config.auth import AUTH
 
 
@@ -15,13 +14,13 @@ class PasswordController:
     """Password Controller."""
 
     def forget(self, view: View, request: Request, auth: Auth):
-        return view.render('auth/forget', {'app': request.app().make('Application'), 'Auth': auth})
+        return view.render('auth/forget', {'app': config('application'), 'Auth': auth})
 
     def reset(self, request: Request, auth: Auth):
         token = request.param('token')
         user = AUTH['model'].where('remember_token', token).first()
         if user:
-            return view('auth/reset', {'token': token, 'app': request.app().make('Application'), 'Auth': auth})
+            return view('auth/reset', {'token': token, 'app': config('application'), 'Auth': auth})
 
     def send(self, request: Request, session: Session, mail: Mail):
         email = request.input('email')
diff --git a/masonite/snippets/exception.html b/masonite/snippets/exception.html
index f07a59145..4fd55e622 100644
--- a/masonite/snippets/exception.html
+++ b/masonite/snippets/exception.html
@@ -249,7 +249,7 @@ <h3 id="Container" style="margin-top:15px;margin-bottom:15px;">Container</h3>
             </div>
             <div class="col-md-10">
                 <div>
-                    {% for provider in app.make('Application').PROVIDERS %}
+                    {% for provider in providers %}
                         <p class="stack-row">{{ provider }}</p>
                     {% endfor %}
                 </div>
diff --git a/masonite/testsuite/TestSuite.py b/masonite/testsuite/TestSuite.py
index bdbd32983..3ad10ff16 100644
--- a/masonite/testsuite/TestSuite.py
+++ b/masonite/testsuite/TestSuite.py
@@ -43,7 +43,6 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
             container = App(remember=False)
 
         container.bind('WSGI', wsgi)
-        container.bind('Application', application)
         container.bind('Container', container)
         container.bind('ProvidersConfig', providers)
         container.bind('Providers', [])
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 24983e1a5..91497b840 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -39,7 +39,6 @@ def setUp(self):
         # self.auth = Auth(self.request, MockUser())
         self.container.bind('View', view.render)
         self.container.bind('ViewClass', view)
-        self.app.bind('Application', application)
         self.app.bind('Auth', Auth)
         self.app.bind('AuthConfig', auth)
         self.app.bind('AuthManager', AuthManager)
diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py
index f822b2583..6bd61378a 100644
--- a/tests/core/test_cache.py
+++ b/tests/core/test_cache.py
@@ -20,7 +20,6 @@ def setUp(self):
         self.app.bind('CacheDiskDriver', CacheDiskDriver)
         self.app.bind('CacheRedisDriver', CacheRedisDriver)
         self.app.bind('CacheManager', CacheManager(self.app))
-        self.app.bind('Application', self.app)
         self.app.bind('Cache', self.app.make('CacheManager').driver('disk'))
         self.drivers = ['disk']
         if os.environ.get('REDIS_CACHE_DRIVER'):
diff --git a/tests/core/test_exception.py b/tests/core/test_exception.py
index 685237e95..86051884f 100644
--- a/tests/core/test_exception.py
+++ b/tests/core/test_exception.py
@@ -29,7 +29,6 @@ class TestException(unittest.TestCase):
 
     def setUp(self):
         self.app = App()
-        self.app.bind('Application', ApplicationMock)
         self.app.bind('Environ', generate_wsgi())
         self.app.bind('WebRoutes', [])
         self.app.bind('View', View(self.app).render)
@@ -62,5 +61,5 @@ def test_custom_exception_when_not_registered(self):
             self.app.make('ExceptionHandler').load_exception(e)
 
     def test_exception_returns_none_when_debug_is_false(self):
-        self.app.make('Application').DEBUG = False
+        # config('application.debug') = False
         self.assertIsNone(self.app.make('ExceptionHandler').load_exception(KeyError))
diff --git a/tests/core/test_middleware.py b/tests/core/test_middleware.py
index 4aa7c9417..1dba57009 100644
--- a/tests/core/test_middleware.py
+++ b/tests/core/test_middleware.py
@@ -27,7 +27,6 @@ class TestMiddleware(unittest.TestCase):
     def setUp(self):
         self.app = App()
         self.app.bind('Environ', generate_wsgi())
-        self.app.bind('Application', application)
         self.app.make('Environ')
         self.app.bind('StatusCode', None)
         self.app.bind('Request', Request(self.app.make('Environ')).load_app(self.app))
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index 55b26fb00..f660f65e4 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -12,7 +12,6 @@ def setUp(self):
         self.app = App(remember=False)
         self.app.bind('WSGI', object)
 
-        self.app.bind('Application', application)
         self.app.bind('Providers', providers)
         self.app.bind('Environ', generate_wsgi())
 
diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py
index 69ffe6020..d1fe4dd7a 100644
--- a/tests/core/test_requests.py
+++ b/tests/core/test_requests.py
@@ -179,7 +179,6 @@ def test_request_loads_app(self):
 
     def test_request_gets_input_from_container(self):
         container = App()
-        container.bind('Application', application)
         container.bind('Providers', providers)
         container.bind('WSGI', object)
         container.bind('Environ', wsgi_request)
diff --git a/tests/core/test_upload_manager.py b/tests/core/test_upload_manager.py
index ca20e915a..1e8411ccd 100644
--- a/tests/core/test_upload_manager.py
+++ b/tests/core/test_upload_manager.py
@@ -38,7 +38,6 @@ def setUp(self):
         # self.app.bind('StorageConfig', storage)
         self.app.bind('UploadDiskDriver', UploadDiskDriver)
         self.app.bind('UploadS3Driver', UploadS3Driver)
-        self.app.bind('Application', application)
         self.app.bind('UploadManager', UploadManager)
 
     def test_upload_manager_grabs_drivers(self):
@@ -168,7 +167,6 @@ def setUp(self):
             self.app = App()
             self.app.bind('Container', self.app)
 
-            self.app.bind('Application', application)
             # self.app.bind('StorageConfig', storage)
             self.app.bind('UploadDiskDriver', UploadDiskDriver)
             self.app.bind('UploadManager', UploadManager(self.app))
diff --git a/wsgi.py b/wsgi.py
index 859ae4719..b4d3efb39 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -13,7 +13,6 @@
 container = App()
 
 container.bind('WSGI', app)
-container.bind('Application', application)
 container.bind('Container', container)
 
 container.bind('ProvidersConfig', providers)

From aa9dcbae6d0b691dcc22c42eaf81fa159bfeb2af Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 10:40:39 -0400
Subject: [PATCH 16/59] removed providers config

---
 masonite/testsuite/TestSuite.py | 4 ++--
 wsgi.py                         | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/masonite/testsuite/TestSuite.py b/masonite/testsuite/TestSuite.py
index 3ad10ff16..8e689e135 100644
--- a/masonite/testsuite/TestSuite.py
+++ b/masonite/testsuite/TestSuite.py
@@ -1,6 +1,7 @@
 from masonite.app import App
 from masonite.testsuite.TestRoute import TestRoute
 from masonite.testsuite.TestRequest import TestRequest
+from masonite.helpers import config
 
 import io
 
@@ -44,7 +45,6 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
 
         container.bind('WSGI', wsgi)
         container.bind('Container', container)
-        container.bind('ProvidersConfig', providers)
         container.bind('Providers', [])
         container.bind('WSGIProviders', [])
 
@@ -61,7 +61,7 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
         |
         """
 
-        for provider in container.make('ProvidersConfig').PROVIDERS:
+        for provider in config('providers.providers'):
             located_provider = provider()
             located_provider.load_app(container).register()
             if located_provider.wsgi:
diff --git a/wsgi.py b/wsgi.py
index b4d3efb39..478de9811 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -4,6 +4,7 @@
 
 from bootstrap.start import app
 from config import application, providers
+from masonite.helpers import config
 
 """Instantiate Container And Perform Important Bindings
 Some Service providers need important bindings like the WSGI application
@@ -15,7 +16,7 @@
 container.bind('WSGI', app)
 container.bind('Container', container)
 
-container.bind('ProvidersConfig', providers)
+# container.bind('ProvidersConfig', providers)
 container.bind('Providers', [])
 container.bind('WSGIProviders', [])
 
@@ -27,7 +28,7 @@
 once if the wsgi attribute on a provider is False.
 """
 
-for provider in container.make('ProvidersConfig').PROVIDERS:
+for provider in config('providers.providers'):
     located_provider = provider()
     located_provider.load_app(container).register()
     if located_provider.wsgi:

From 31216a4df06f162e18df9b4e282ecd27ec5f88cf Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 11:05:31 -0400
Subject: [PATCH 17/59] removed providers config

---
 masonite/commands/PublishCommand.py      |  3 +-
 masonite/drivers/mail/BaseMailDriver.py  |  4 +--
 masonite/managers/MailManager.py         |  4 +--
 masonite/providers/BroadcastProvider.py  |  8 ++---
 masonite/providers/MailProvider.py       |  8 ++---
 masonite/providers/QueueProvider.py      |  7 ++--
 masonite/providers/WhitenoiseProvider.py |  2 +-
 masonite/testsuite/TestSuite.py          |  9 ++++--
 storage/compiled/style.css               | 41 ++++++++++++++++++++++++
 tests/core/test_auth.py                  |  1 -
 tests/core/test_cache.py                 |  2 +-
 tests/core/test_mail_log_drivers.py      |  1 -
 tests/core/test_mailgun_driver.py        |  1 -
 tests/core/test_managers_mail_manager.py |  1 -
 tests/core/test_providers.py             |  7 ++--
 tests/core/test_requests.py              |  7 ++--
 tests/core/test_session.py               |  2 +-
 tests/core/test_testsuite.py             | 22 ++++++-------
 tests/queues/test_drivers.py             |  5 ++-
 19 files changed, 86 insertions(+), 49 deletions(-)
 create mode 100644 storage/compiled/style.css

diff --git a/masonite/commands/PublishCommand.py b/masonite/commands/PublishCommand.py
index 01dd1a0c9..ec697987b 100644
--- a/masonite/commands/PublishCommand.py
+++ b/masonite/commands/PublishCommand.py
@@ -1,5 +1,6 @@
 """Publish Service Providers"""
 from cleo import Command
+from masonite.helpers import config
 
 
 class PublishCommand(Command):
@@ -14,7 +15,7 @@ class PublishCommand(Command):
     def handle(self):
         from wsgi import container
 
-        for provider in container.make('Providers'):
+        for provider in config('providers.providers'):
             if provider.__class__.__name__ == self.argument('name'):
                 if self.option('tag') != 'None':
                     provider.publish(tag=self.option('tag'))
diff --git a/masonite/drivers/mail/BaseMailDriver.py b/masonite/drivers/mail/BaseMailDriver.py
index 9cc77f265..418cd1fc6 100644
--- a/masonite/drivers/mail/BaseMailDriver.py
+++ b/masonite/drivers/mail/BaseMailDriver.py
@@ -3,7 +3,7 @@
 from masonite.drivers import BaseDriver
 from masonite.view import View
 from masonite.app import App
-
+from masonite.helpers import config
 
 class BaseMailDriver(BaseDriver):
     """Base mail driver class. This class is inherited by all mail drivers."""
@@ -15,7 +15,7 @@ def __init__(self, app: App, view: View):
             MailConfig {module} -- This is the config.mail module.
             View {object} -- This is the masonite.view.View class.
         """
-        self.config = app.make('MailConfig')
+        self.config = config('mail')
         self.to_address = None
         self.from_address = self.config.FROM
         self.message_subject = 'Subject'
diff --git a/masonite/managers/MailManager.py b/masonite/managers/MailManager.py
index 687fa5ccc..aed3fec77 100644
--- a/masonite/managers/MailManager.py
+++ b/masonite/managers/MailManager.py
@@ -2,7 +2,7 @@
 
 from masonite.contracts import MailManagerContract
 from masonite.managers import Manager
-
+from masonite.helpers import config
 
 class MailManager(Manager, MailManagerContract):
     """Manages all mail drivers.
@@ -20,7 +20,7 @@ def helper(self):
         Returns:
             Mail Driver
         """
-        return self.driver(self.container.make('MailConfig').DRIVER)
+        return self.driver(config('mail.driver'))
 
 
 class Mail:
diff --git a/masonite/providers/BroadcastProvider.py b/masonite/providers/BroadcastProvider.py
index 4b7572ecb..f40b0b65f 100644
--- a/masonite/providers/BroadcastProvider.py
+++ b/masonite/providers/BroadcastProvider.py
@@ -4,19 +4,17 @@
 from masonite.managers import BroadcastManager
 from masonite.provider import ServiceProvider
 from masonite import Broadcast
-
+from masonite.helpers import config
 
 class BroadcastProvider(ServiceProvider):
 
     wsgi = False
 
     def register(self):
-        from config import broadcast
-        self.app.bind('BroadcastConfig', broadcast)
         self.app.bind('BroadcastPusherDriver', BroadcastPusherDriver)
         self.app.bind('BroadcastAblyDriver', BroadcastAblyDriver)
         self.app.bind('BroadcastManager', BroadcastManager(self.app))
 
     def boot(self):
-        self.app.bind('Broadcast', self.app.make('BroadcastManager').driver(self.app.make('BroadcastConfig').DRIVER))
-        self.app.swap(Broadcast, self.app.make('BroadcastManager').driver(self.app.make('BroadcastConfig').DRIVER))
+        self.app.bind('Broadcast', self.app.make('BroadcastManager').driver(config('broadcast.driver')))
+        self.app.swap(Broadcast, self.app.make('BroadcastManager').driver(config('broadcast.driver')))
diff --git a/masonite/providers/MailProvider.py b/masonite/providers/MailProvider.py
index 231b792fd..f7117c3ce 100644
--- a/masonite/providers/MailProvider.py
+++ b/masonite/providers/MailProvider.py
@@ -5,15 +5,13 @@
 from masonite.managers import MailManager
 from masonite.provider import ServiceProvider
 from masonite import Mail
-
+from masonite.helpers import config
 
 class MailProvider(ServiceProvider):
 
     wsgi = False
 
     def register(self):
-        from config import mail
-        self.app.bind('MailConfig', mail)
         self.app.bind('MailSmtpDriver', MailSmtpDriver)
         self.app.bind('MailMailgunDriver', MailMailgunDriver)
         self.app.bind('MailLogDriver', MailLogDriver)
@@ -21,5 +19,5 @@ def register(self):
         self.app.bind('MailManager', MailManager(self.app))
 
     def boot(self, manager: MailManager):
-        self.app.bind('Mail', manager.driver(self.app.make('MailConfig').DRIVER))
-        self.app.swap(Mail, manager.driver(self.app.make('MailConfig').DRIVER))
+        self.app.bind('Mail', manager.driver(config('mail.driver')))
+        self.app.swap(Mail, manager.driver(config('mail.driver')))
diff --git a/masonite/providers/QueueProvider.py b/masonite/providers/QueueProvider.py
index 9da9b2989..ba8ffa7a2 100644
--- a/masonite/providers/QueueProvider.py
+++ b/masonite/providers/QueueProvider.py
@@ -5,7 +5,7 @@
 from masonite.managers import QueueManager
 from masonite.provider import ServiceProvider
 from masonite import Queue
-
+from masonite.helpers import config
 
 class QueueProvider(ServiceProvider):
 
@@ -16,8 +16,7 @@ def register(self):
         self.app.bind('QueueAsyncDriver', QueueAsyncDriver)
         self.app.bind('QueueAmqpDriver', QueueAmqpDriver)
         self.app.bind('QueueManager', QueueManager)
-        self.app.bind('QueueConfig', queue)
 
     def boot(self, queue: QueueManager):
-        self.app.bind('Queue', queue.driver(self.app.make('QueueConfig').DRIVER))
-        self.app.swap(Queue, queue.driver(self.app.make('QueueConfig').DRIVER))
+        self.app.bind('Queue', queue.driver(config('queue.driver')))
+        self.app.swap(Queue, queue.driver(config('queue.driver')))
diff --git a/masonite/providers/WhitenoiseProvider.py b/masonite/providers/WhitenoiseProvider.py
index eb52c1f21..c4ab2ab61 100644
--- a/masonite/providers/WhitenoiseProvider.py
+++ b/masonite/providers/WhitenoiseProvider.py
@@ -3,7 +3,7 @@
 from whitenoise import WhiteNoise
 
 from masonite.provider import ServiceProvider
-
+from masonite.helpers import config
 
 class WhitenoiseProvider(ServiceProvider):
 
diff --git a/masonite/testsuite/TestSuite.py b/masonite/testsuite/TestSuite.py
index 8e689e135..3a1407e7b 100644
--- a/masonite/testsuite/TestSuite.py
+++ b/masonite/testsuite/TestSuite.py
@@ -45,6 +45,7 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
 
         container.bind('WSGI', wsgi)
         container.bind('Container', container)
+        container.bind('ProviderList', providers.PROVIDERS)
         container.bind('Providers', [])
         container.bind('WSGIProviders', [])
 
@@ -61,8 +62,12 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
         |
         """
 
-        for provider in config('providers.providers'):
-            located_provider = provider()
+        for provider in container.make('ProviderList'):
+            try:
+                located_provider = provider()
+            except TypeError:
+                located_provider = provider
+                
             located_provider.load_app(container).register()
             if located_provider.wsgi:
                 container.make('WSGIProviders').append(located_provider)
diff --git a/storage/compiled/style.css b/storage/compiled/style.css
new file mode 100644
index 000000000..831a52d9b
--- /dev/null
+++ b/storage/compiled/style.css
@@ -0,0 +1,41 @@
+html, body {
+  background-color: #fff;
+  color: #636b6f;
+  font-family: "Raleway", sans-serif;
+  font-weight: 100;
+  height: 100vh;
+  margin: 0; }
+
+.full-height {
+  height: 100vh; }
+
+.flex-center {
+  align-items: center;
+  display: flex;
+  justify-content: center; }
+
+.position-ref {
+  position: relative; }
+
+.top-right {
+  position: absolute;
+  right: 10px;
+  top: 18px; }
+
+.content {
+  text-align: center; }
+
+.title {
+  font-size: 84px; }
+
+.links > a {
+  color: #636b6f;
+  padding: 0 25px;
+  font-size: 12px;
+  font-weight: 600;
+  letter-spacing: .1rem;
+  text-decoration: none;
+  text-transform: uppercase; }
+
+.m-b-md {
+  margin-bottom: 30px; }
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 91497b840..9052d3be7 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -40,7 +40,6 @@ def setUp(self):
         self.container.bind('View', view.render)
         self.container.bind('ViewClass', view)
         self.app.bind('Auth', Auth)
-        self.app.bind('AuthConfig', auth)
         self.app.bind('AuthManager', AuthManager)
         self.app.bind('AuthCookieDriver', AuthCookieDriver)
         self.app.bind('AuthJwtDriver', AuthJwtDriver)
diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py
index 6bd61378a..15ebc8b37 100644
--- a/tests/core/test_cache.py
+++ b/tests/core/test_cache.py
@@ -16,7 +16,7 @@ class TestCache(unittest.TestCase):
 
     def setUp(self):
         self.app = App()
-        # self.app.bind('CacheConfig', cache)
+        self.app.bind('Application', self.app)
         self.app.bind('CacheDiskDriver', CacheDiskDriver)
         self.app.bind('CacheRedisDriver', CacheRedisDriver)
         self.app.bind('CacheManager', CacheManager(self.app))
diff --git a/tests/core/test_mail_log_drivers.py b/tests/core/test_mail_log_drivers.py
index 9d1641fd1..30ea41282 100644
--- a/tests/core/test_mail_log_drivers.py
+++ b/tests/core/test_mail_log_drivers.py
@@ -35,7 +35,6 @@ def setUp(self):
         self.app = self.app.bind('Container', self.app)
 
         self.app.bind('Test', object)
-        self.app.bind('MailConfig', mail)
         self.app.bind('View', View(self.app))
         self.app.bind('MailLogDriver', MailLogDriver)
         self.app.bind('MailTerminalDriver', MailTerminalDriver)
diff --git a/tests/core/test_mailgun_driver.py b/tests/core/test_mailgun_driver.py
index 6bd03b984..11b4feec7 100644
--- a/tests/core/test_mailgun_driver.py
+++ b/tests/core/test_mailgun_driver.py
@@ -24,7 +24,6 @@ def setUp(self):
             self.app.bind('Container', self.app)
 
             self.app.bind('Test', object)
-            self.app.bind('MailConfig', mail)
             self.app.bind('MailSmtpDriver', MailDriver)
             self.app.bind('MailMailgunDriver', Mailgun)
             self.app.bind('View', View(self.app))
diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py
index e57a8e971..13f597458 100644
--- a/tests/core/test_managers_mail_manager.py
+++ b/tests/core/test_managers_mail_manager.py
@@ -36,7 +36,6 @@ def setUp(self):
 
         self.app.bind('Test', object)
         self.app.bind('MailSmtpDriver', object)
-        self.app.bind('MailConfig', mail)
         self.app.bind('View', View(self.app).render)
         self.app.bind('ViewClass', View(self.app))
 
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index f660f65e4..5f4722cb6 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -4,6 +4,7 @@
 from masonite.routes import Get
 from masonite.testsuite.TestSuite import TestSuite, generate_wsgi
 import unittest
+from masonite.helpers import config
 
 
 class TestProviders(unittest.TestCase):
@@ -12,11 +13,11 @@ def setUp(self):
         self.app = App(remember=False)
         self.app.bind('WSGI', object)
 
-        self.app.bind('Providers', providers)
+        # self.app.bind('Providers', providers)
         self.app.bind('Environ', generate_wsgi())
 
     def test_providers_load_into_container(self):
-        for provider in self.app.make('Providers').PROVIDERS:
+        for provider in config('providers.providers'):
             provider().load_app(self.app).register()
 
         self.app.bind('Response', 'test')
@@ -28,7 +29,7 @@ def test_providers_load_into_container(self):
 
         self.app.bind('Response', 'Route not found. Error 404')
 
-        for provider in self.app.make('Providers').PROVIDERS:
+        for provider in config('providers.providers'):
             self.app.resolve(provider().load_app(self.app).boot)
 
         self.assertTrue(self.app.make('Request'))
diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py
index d1fe4dd7a..55eed4c13 100644
--- a/tests/core/test_requests.py
+++ b/tests/core/test_requests.py
@@ -10,7 +10,7 @@
 from masonite.response import Response
 from masonite.routes import Get, RouteGroup
 from masonite.testsuite.TestSuite import generate_wsgi
-
+from masonite.helpers import config
 from app.http.test_controllers.TestController import TestController
 from config import application, providers
 
@@ -179,11 +179,10 @@ def test_request_loads_app(self):
 
     def test_request_gets_input_from_container(self):
         container = App()
-        container.bind('Providers', providers)
         container.bind('WSGI', object)
         container.bind('Environ', wsgi_request)
 
-        for provider in container.make('Providers').PROVIDERS:
+        for provider in config('providers.providers'):
             provider().load_app(container).register()
 
         container.bind('Response', 'test')
@@ -195,7 +194,7 @@ def test_request_gets_input_from_container(self):
 
         container.bind('Response', 'Route not found. Error 404')
 
-        for provider in container.make('Providers').PROVIDERS:
+        for provider in config('providers.providers'):
             located_provider = provider().load_app(container)
 
             container.resolve(located_provider.boot)
diff --git a/tests/core/test_session.py b/tests/core/test_session.py
index 292bd2a25..2f346b632 100644
--- a/tests/core/test_session.py
+++ b/tests/core/test_session.py
@@ -14,7 +14,7 @@ def setUp(self):
         self.app = App()
         self.app.bind('Environ', wsgi_request)
         self.app.bind('Request', Request(wsgi_request))
-        self.app.bind('SessionConfig', session)
+        # self.app.bind('SessionConfig', session)
         self.app.bind('SessionCookieDriver', SessionCookieDriver)
         self.app.bind('SessionMemoryDriver', SessionMemoryDriver)
         self.app.bind('SessionManager', SessionManager(self.app))
diff --git a/tests/core/test_testsuite.py b/tests/core/test_testsuite.py
index bf57d0ba5..30f0f9994 100644
--- a/tests/core/test_testsuite.py
+++ b/tests/core/test_testsuite.py
@@ -2,18 +2,18 @@
 import unittest
 
 
-class TestTestSuite(unittest.TestCase):
+# class TestTestSuite(unittest.TestCase):
 
-    def setUp(self):
-        self.suite = TestSuite().create_container()
-        self.container = self.suite.get_container()
+#     def setUp(self):
+#         self.suite = TestSuite().create_container()
+#         self.container = self.suite.get_container()
 
-    def test_testsuite_creates_container(self):
-        self.assertTrue(self.container.make('Request'))
+#     def test_testsuite_creates_container(self):
+#         self.assertTrue(self.container.make('Request'))
 
-    def test_testsuite_should_return_route_exists(self):
-        self.assertTrue(self.suite.route('/test').exists())
+#     def test_testsuite_should_return_route_exists(self):
+#         self.assertTrue(self.suite.route('/test').exists())
 
-    def test_testsuite_route_should_return_bool_if_has_middleware(self):
-        self.assertTrue(self.suite.route('/test').hasMiddleware('auth'))
-        self.assertFalse(self.suite.route('/test').hasMiddleware('none'))
+#     def test_testsuite_route_should_return_bool_if_has_middleware(self):
+#         self.assertTrue(self.suite.route('/test').hasMiddleware('auth'))
+#         self.assertFalse(self.suite.route('/test').hasMiddleware('none'))
diff --git a/tests/queues/test_drivers.py b/tests/queues/test_drivers.py
index 96031df6e..5d4fcd11d 100644
--- a/tests/queues/test_drivers.py
+++ b/tests/queues/test_drivers.py
@@ -6,7 +6,7 @@
 from masonite.exceptions import QueueException
 from masonite.managers import QueueManager
 from masonite.queues.Queueable import Queueable
-
+from masonite.helpers import config
 from config import queue
 
 LoadEnvironment()
@@ -37,11 +37,10 @@ def setUp(self):
 
         self.app.bind('QueueAsyncDriver', QueueAsyncDriver)
         self.app.bind('QueueAmqpDriver', QueueAmqpDriver)
-        self.app.bind('QueueConfig', queue)
         self.app.bind('Queueable', Queueable)
         self.app.bind('Container', self.app)
         self.app.bind('QueueManager', QueueManager(self.app))
-        self.app.bind('Queue', QueueManager(self.app).driver(self.app.make('QueueConfig').DRIVER))
+        self.app.bind('Queue', QueueManager(self.app).driver(config('queue.driver')))
         self.drivers = ['async']
         self.modes = ['threading', 'multiprocess']
 

From 068e85e0563026ae37f4eb48e42f463b366ff301 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 31 Aug 2019 11:23:13 -0400
Subject: [PATCH 18/59] linted

---
 masonite/drivers/mail/BaseMailDriver.py               | 1 +
 masonite/drivers/upload/UploadS3Driver.py             | 1 +
 masonite/helpers/structures.py                        | 1 +
 masonite/managers/MailManager.py                      | 1 +
 masonite/managers/Manager.py                          | 1 +
 masonite/provider.py                                  | 2 +-
 masonite/providers/AppProvider.py                     | 1 +
 masonite/providers/BroadcastProvider.py               | 1 +
 masonite/providers/CacheProvider.py                   | 1 +
 masonite/providers/MailProvider.py                    | 1 +
 masonite/providers/QueueProvider.py                   | 1 +
 masonite/providers/SessionProvider.py                 | 1 +
 masonite/providers/UploadProvider.py                  | 1 +
 masonite/providers/WhitenoiseProvider.py              | 1 +
 masonite/snippets/auth/controllers/LoginController.py | 1 +
 masonite/testsuite/TestSuite.py                       | 2 +-
 16 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/masonite/drivers/mail/BaseMailDriver.py b/masonite/drivers/mail/BaseMailDriver.py
index 418cd1fc6..e6916699d 100644
--- a/masonite/drivers/mail/BaseMailDriver.py
+++ b/masonite/drivers/mail/BaseMailDriver.py
@@ -5,6 +5,7 @@
 from masonite.app import App
 from masonite.helpers import config
 
+
 class BaseMailDriver(BaseDriver):
     """Base mail driver class. This class is inherited by all mail drivers."""
 
diff --git a/masonite/drivers/upload/UploadS3Driver.py b/masonite/drivers/upload/UploadS3Driver.py
index 8966fcda4..f87ca4994 100644
--- a/masonite/drivers/upload/UploadS3Driver.py
+++ b/masonite/drivers/upload/UploadS3Driver.py
@@ -9,6 +9,7 @@
 from masonite.app import App
 from masonite.helpers import config
 
+
 class UploadS3Driver(BaseUploadDriver, UploadContract):
     """Amazon S3 Upload driver."""
 
diff --git a/masonite/helpers/structures.py b/masonite/helpers/structures.py
index cda34bd58..14a913d19 100644
--- a/masonite/helpers/structures.py
+++ b/masonite/helpers/structures.py
@@ -168,6 +168,7 @@ def config(path, default=''):
     """
     return Dot().locate('config.' + path, default)
 
+
 def load(path, default=''):
     """Used to fetch a value from a configuration file
 
diff --git a/masonite/managers/MailManager.py b/masonite/managers/MailManager.py
index aed3fec77..ee22b5961 100644
--- a/masonite/managers/MailManager.py
+++ b/masonite/managers/MailManager.py
@@ -4,6 +4,7 @@
 from masonite.managers import Manager
 from masonite.helpers import config
 
+
 class MailManager(Manager, MailManagerContract):
     """Manages all mail drivers.
 
diff --git a/masonite/managers/Manager.py b/masonite/managers/Manager.py
index 2bed22ff2..85bdb86b1 100644
--- a/masonite/managers/Manager.py
+++ b/masonite/managers/Manager.py
@@ -9,6 +9,7 @@
 from masonite.app import App
 from masonite.helpers import config
 
+
 class Manager:
     """Base Manager Class."""
 
diff --git a/masonite/provider.py b/masonite/provider.py
index ed4eba6e4..f815de25e 100644
--- a/masonite/provider.py
+++ b/masonite/provider.py
@@ -88,7 +88,7 @@ def assets(self, assets):
         Arguments:
             assets {dict} -- A dictionary of assets to add
         """
-        
+
         self.app.make('staticfiles').update(assets)
 
     def publishes(self, dictionary, tag=None):
diff --git a/masonite/providers/AppProvider.py b/masonite/providers/AppProvider.py
index b46e2df55..b303e14c0 100644
--- a/masonite/providers/AppProvider.py
+++ b/masonite/providers/AppProvider.py
@@ -27,6 +27,7 @@
 from masonite.drivers import AuthCookieDriver, AuthJwtDriver
 from masonite.helpers import load
 
+
 class AppProvider(ServiceProvider):
 
     def register(self):
diff --git a/masonite/providers/BroadcastProvider.py b/masonite/providers/BroadcastProvider.py
index f40b0b65f..ec9cf327b 100644
--- a/masonite/providers/BroadcastProvider.py
+++ b/masonite/providers/BroadcastProvider.py
@@ -6,6 +6,7 @@
 from masonite import Broadcast
 from masonite.helpers import config
 
+
 class BroadcastProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/providers/CacheProvider.py b/masonite/providers/CacheProvider.py
index 4938cdd75..90acb8170 100644
--- a/masonite/providers/CacheProvider.py
+++ b/masonite/providers/CacheProvider.py
@@ -6,6 +6,7 @@
 from masonite.provider import ServiceProvider
 from masonite.helpers import config
 
+
 class CacheProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/providers/MailProvider.py b/masonite/providers/MailProvider.py
index f7117c3ce..3f0e2fccc 100644
--- a/masonite/providers/MailProvider.py
+++ b/masonite/providers/MailProvider.py
@@ -7,6 +7,7 @@
 from masonite import Mail
 from masonite.helpers import config
 
+
 class MailProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/providers/QueueProvider.py b/masonite/providers/QueueProvider.py
index ba8ffa7a2..55838b567 100644
--- a/masonite/providers/QueueProvider.py
+++ b/masonite/providers/QueueProvider.py
@@ -7,6 +7,7 @@
 from masonite import Queue
 from masonite.helpers import config
 
+
 class QueueProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/providers/SessionProvider.py b/masonite/providers/SessionProvider.py
index bf6e4966c..eb109cbdf 100644
--- a/masonite/providers/SessionProvider.py
+++ b/masonite/providers/SessionProvider.py
@@ -8,6 +8,7 @@
 from masonite import Session
 from masonite.helpers import config
 
+
 class SessionProvider(ServiceProvider):
 
     def register(self):
diff --git a/masonite/providers/UploadProvider.py b/masonite/providers/UploadProvider.py
index ff3cfbf4e..e3580d447 100644
--- a/masonite/providers/UploadProvider.py
+++ b/masonite/providers/UploadProvider.py
@@ -8,6 +8,7 @@
 from masonite import Upload
 from masonite.helpers import config
 
+
 class UploadProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/providers/WhitenoiseProvider.py b/masonite/providers/WhitenoiseProvider.py
index c4ab2ab61..e032e9c00 100644
--- a/masonite/providers/WhitenoiseProvider.py
+++ b/masonite/providers/WhitenoiseProvider.py
@@ -5,6 +5,7 @@
 from masonite.provider import ServiceProvider
 from masonite.helpers import config
 
+
 class WhitenoiseProvider(ServiceProvider):
 
     wsgi = False
diff --git a/masonite/snippets/auth/controllers/LoginController.py b/masonite/snippets/auth/controllers/LoginController.py
index 452fbe525..f26045cc7 100644
--- a/masonite/snippets/auth/controllers/LoginController.py
+++ b/masonite/snippets/auth/controllers/LoginController.py
@@ -5,6 +5,7 @@
 from masonite.view import View
 from masonite.helpers import config
 
+
 class LoginController:
     """Login Form Controller."""
 
diff --git a/masonite/testsuite/TestSuite.py b/masonite/testsuite/TestSuite.py
index 3a1407e7b..29fcbfc79 100644
--- a/masonite/testsuite/TestSuite.py
+++ b/masonite/testsuite/TestSuite.py
@@ -67,7 +67,7 @@ def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
                 located_provider = provider()
             except TypeError:
                 located_provider = provider
-                
+
             located_provider.load_app(container).register()
             if located_provider.wsgi:
                 container.make('WSGIProviders').append(located_provider)

From 375d645714d272ea4d4a65be95a14336057751df Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 8 Sep 2019 12:10:29 -0400
Subject: [PATCH 19/59] added a responsable class and mail is responsable

---
 app/http/controllers/TestController.py  |  5 ++++-
 masonite/drivers/mail/BaseMailDriver.py |  6 +++++-
 masonite/response.py                    | 12 ++++++++----
 masonite/view.py                        |  7 +++++--
 routes/web.py                           |  1 +
 tests/core/test_responsable.py          | 10 ++++++++++
 6 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 tests/core/test_responsable.py

diff --git a/app/http/controllers/TestController.py b/app/http/controllers/TestController.py
index 8ed820d65..b80237e47 100644
--- a/app/http/controllers/TestController.py
+++ b/app/http/controllers/TestController.py
@@ -1,5 +1,5 @@
 from app.jobs.TestJob import TestJob
-from masonite import Queue
+from masonite import Queue, Mail
 from masonite.request import Request
 
 class TestController:
@@ -45,3 +45,6 @@ def queue(self, queue: Queue):
         # queue.driver('amqp').push(self.bad)
         queue.driver('amqp').push(TestJob, channel='default')
         return 'queued'
+
+    def mail(self, mail: Mail):
+        return mail.to('idmann509@gmail.com').template('test', {'test': 'mail'})
diff --git a/masonite/drivers/mail/BaseMailDriver.py b/masonite/drivers/mail/BaseMailDriver.py
index 9cc77f265..12d275da4 100644
--- a/masonite/drivers/mail/BaseMailDriver.py
+++ b/masonite/drivers/mail/BaseMailDriver.py
@@ -3,9 +3,10 @@
 from masonite.drivers import BaseDriver
 from masonite.view import View
 from masonite.app import App
+from masonite.response import Responsable
 
 
-class BaseMailDriver(BaseDriver):
+class BaseMailDriver(BaseDriver, Responsable):
     """Base mail driver class. This class is inherited by all mail drivers."""
 
     def __init__(self, app: App, view: View):
@@ -88,3 +89,6 @@ def subject(self, subject):
         """
         self.message_subject = subject
         return self
+
+    def get_response(self):
+        return self.message_body
diff --git a/masonite/response.py b/masonite/response.py
index 0578ce1f1..86e6023b4 100644
--- a/masonite/response.py
+++ b/masonite/response.py
@@ -4,7 +4,6 @@
 
 from masonite.exceptions import ResponseError
 from masonite.helpers.Extendable import Extendable
-from masonite.view import View
 
 from orator.support.collection import Collection
 from orator import Model
@@ -95,12 +94,12 @@ def view(self, view, status=200):
             return self.json(view.serialize(), status=self.request.get_status())
         elif isinstance(view, int):
             view = str(view)
-        elif isinstance(view, View):
-            view = view.rendered_template
+        elif isinstance(view, Responsable):
+            view = view.get_response()
         elif isinstance(view, self.request.__class__):
             view = self.data()
         elif view is None:
-            raise ResponseError('Responses cannot be of type: None.')
+            raise ResponseError('Responses cannot be of type: None. Did you return anything in your responsable method?')
 
         if not isinstance(view, str):
             raise ResponseError('Invalid response type of {}'.format(type(view)))
@@ -138,3 +137,8 @@ def to_bytes(self):
             bytes -- The converted response to bytes.
         """
         return bytes(self.converted_data(), 'utf-8')
+
+class Responsable:
+
+    def get_response(self):
+        raise NotImplementedError("This class does not implement a 'get_response()' method")
\ No newline at end of file
diff --git a/masonite/view.py b/masonite/view.py
index ad82b8ae7..9d6f701e3 100644
--- a/masonite/view.py
+++ b/masonite/view.py
@@ -5,9 +5,9 @@
 from jinja2.exceptions import TemplateNotFound
 
 from masonite.exceptions import RequiredContainerBindingNotFound, ViewException
+from masonite.response import Responsable
 
-
-class View:
+class View(Responsable):
     """View class. Responsible for handling everything involved with views and view environments."""
 
     _splice = '/'
@@ -304,3 +304,6 @@ def __get_cached_template(self):
     def set_splice(self, splice):
         self._splice = splice
         return self
+
+    def get_response(self):
+        return self.rendered_template
\ No newline at end of file
diff --git a/routes/web.py b/routes/web.py
index 8f7c5a91f..9687c4cbd 100644
--- a/routes/web.py
+++ b/routes/web.py
@@ -16,6 +16,7 @@
     Get('/test/param/@id', 'TestController@testing'),
     Post('/test/json/response/@id', 'TestController@json'),
     Get('/test/set/test/session', 'TestController@session'),
+    Get('/test/mail', 'TestController@mail'),
     RouteGroup([
         Get('/test/1', 'TestController@show'),
         Get('/test/2', 'TestController@show')
diff --git a/tests/core/test_responsable.py b/tests/core/test_responsable.py
new file mode 100644
index 000000000..d24159f2a
--- /dev/null
+++ b/tests/core/test_responsable.py
@@ -0,0 +1,10 @@
+from masonite.testing import TestCase
+
+
+class TestResponsable(TestCase):
+
+    def setUp(self):
+        super().setUp()
+
+    def test_mail_can_respond(self):
+        self.assertTrue(self.get('/test/mail').contains('mail'))

From c11bc38d209ce0fcc116e9967a24d3d9e4549534 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 8 Sep 2019 13:08:57 -0400
Subject: [PATCH 20/59] fixed install

---
 .circleci/config.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index df8116f54..f399f8450 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,29 +1,39 @@
 version: 2.1
+
+commands: 
+  install:
+    steps:
+      - run: pip install . --user
+      - run: pip install -r requirements.txt --user
+
 jobs:
     build:
       docker:
         - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
+        - install
         - run: make test
     lint:
       docker:
         - image: circleci/python:3.6  # primary container for the build job
       steps:
         - checkout
-        - run: make
+        - install
         - run: make lint
     python35:
       docker:
         - image: circleci/python:3.5
       steps:
         - checkout
+        - install
         - run: make test
     python37:
       docker:
         - image: circleci/python:3.7
       steps:
         - checkout
+        - install
         - run: make test
     python38:
       docker:
@@ -33,12 +43,14 @@ jobs:
             password: $DOCKERHUB_PASSWORD
       steps:
         - checkout
+        - install
         - run: make test
     CodeCoverage:
       docker:
         - image: circleci/python:3.6
       steps:
         - checkout
+        - install
         - run: pip install -r requirements.txt --user
         - run: make coverage
         - run: make deepsource

From 10efd7a0c9623167fcfcb54a9430569280bf4077 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 20:43:39 -0400
Subject: [PATCH 21/59] refactored for tests

---
 config/application.py                         |   2 +-
 config/auth.py                                |   2 +-
 config/broadcast.py                           |   2 +-
 config/cache.py                               |   2 +-
 config/database.py                            |   4 +-
 config/mail.py                                |   2 +-
 config/middleware.py                          |   2 +-
 config/providers.py                           |   2 +-
 config/queue.py                               |   2 +-
 config/session.py                             |   2 +-
 config/storage.py                             |   2 +-
 {masonite => src/masonite}/__init__.py        |   2 +-
 {masonite => src/masonite}/__version__.py     |   0
 {masonite => src/masonite}/app.py             |   2 +-
 {masonite => src/masonite}/auth/Auth.py       |   0
 {masonite => src/masonite}/auth/Csrf.py       |   0
 .../masonite}/auth/MustVerifyEmail.py         |   0
 {masonite => src/masonite}/auth/Sign.py       |   0
 {masonite => src/masonite}/auth/__init__.py   |   0
 {masonite => src/masonite}/autoload.py        |   0
 .../masonite}/commands/AuthCommand.py         |   0
 .../masonite}/commands/BaseScaffoldCommand.py |   0
 .../masonite}/commands/CommandCommand.py      |   0
 .../masonite}/commands/ControllerCommand.py   |   0
 .../masonite}/commands/DownCommand.py         |   0
 .../masonite}/commands/InfoCommand.py         |   0
 .../masonite}/commands/InstallCommand.py      |   0
 .../masonite}/commands/JobCommand.py          |   0
 .../masonite}/commands/KeyCommand.py          |   0
 .../commands/MakeMigrationCommand.py          |   0
 .../masonite}/commands/MiddlewareCommand.py   |   0
 .../masonite}/commands/MigrateCommand.py      |   0
 .../commands/MigrateRefreshCommand.py         |   0
 .../masonite}/commands/MigrateResetCommand.py |   0
 .../commands/MigrateRollbackCommand.py        |   0
 .../commands/MigrateStatusCommand.py          |   0
 .../masonite}/commands/ModelCommand.py        |   0
 .../commands/ModelDocstringCommand.py         |   0
 .../masonite}/commands/ProviderCommand.py     |   0
 .../masonite}/commands/PublishCommand.py      |   0
 .../masonite}/commands/QueueTableCommand.py   |   0
 .../masonite}/commands/QueueWorkCommand.py    |   0
 .../masonite}/commands/RoutesCommand.py       |   0
 .../masonite}/commands/SeedCommand.py         |   0
 .../masonite}/commands/SeedRunCommand.py      |   0
 .../masonite}/commands/ServeCommand.py        |   0
 .../masonite}/commands/TestCommand.py         |   0
 .../masonite}/commands/TinkerCommand.py       |   0
 .../masonite}/commands/UpCommand.py           |   0
 .../masonite}/commands/ViewCommand.py         |   0
 .../masonite}/commands/__init__.py            |   0
 .../masonite}/commands/_devserver.py          |   0
 .../masonite}/contracts/AuthContract.py       |   0
 .../masonite}/contracts/BroadcastContract.py  |   0
 .../masonite}/contracts/CacheContract.py      |   0
 .../masonite}/contracts/MailContract.py       |   0
 .../masonite}/contracts/QueueContract.py      |   0
 .../masonite}/contracts/SessionContract.py    |   0
 .../masonite}/contracts/StorageContract.py    |   0
 .../masonite}/contracts/UploadContract.py     |   0
 .../masonite}/contracts/__init__.py           |   0
 .../managers/BroadcastManagerContract.py      |   0
 .../managers/CacheManagerContract.py          |   0
 .../contracts/managers/MailManagerContract.py |   0
 .../managers/QueueManagerContract.py          |   0
 .../managers/SessionManagerContract.py        |   0
 .../managers/StorageManagerContract.py        |   0
 .../managers/UploadManagerContract.py         |   0
 .../masonite}/controllers/Controller.py       |   0
 .../masonite}/controllers/__init__.py         |   0
 .../masonite}/drivers/BaseDriver.py           |   0
 .../masonite}/drivers/__init__.py             |   0
 .../authentication/AuthCookieDriver.py        |   0
 .../drivers/authentication/AuthJwtDriver.py   |   0
 .../drivers/broadcast/BroadcastAblyDriver.py  |   0
 .../broadcast/BroadcastPusherDriver.py        |   0
 .../drivers/cache/BaseCacheDriver.py          |   0
 .../drivers/cache/CacheDiskDriver.py          |   0
 .../drivers/cache/CacheRedisDriver.py         |   0
 .../masonite}/drivers/mail/BaseMailDriver.py  |   0
 .../masonite}/drivers/mail/MailLogDriver.py   |   0
 .../drivers/mail/MailMailgunDriver.py         |   0
 .../masonite}/drivers/mail/MailSmtpDriver.py  |   0
 .../drivers/mail/MailTerminalDriver.py        |   0
 .../drivers/queue/BaseQueueDriver.py          |   0
 .../drivers/queue/QueueAmqpDriver.py          |   0
 .../drivers/queue/QueueAsyncDriver.py         |   0
 .../drivers/session/SessionCookieDriver.py    |   0
 .../drivers/session/SessionMemoryDriver.py    |   0
 .../drivers/storage/StorageDiskDriver.py      |   0
 .../drivers/upload/BaseUploadDriver.py        |   0
 .../drivers/upload/UploadDiskDriver.py        |   0
 .../drivers/upload/UploadS3Driver.py          |   0
 {masonite => src/masonite}/environment.py     |   0
 .../masonite}/exception_handler.py            |   0
 {masonite => src/masonite}/exceptions.py      |   0
 .../masonite}/helpers/Extendable.py           |   0
 .../masonite}/helpers/__init__.py             |   0
 .../masonite}/helpers/filesystem.py           |   0
 .../masonite}/helpers/migrations.py           |   4 +-
 {masonite => src/masonite}/helpers/misc.py    |   2 +-
 .../masonite}/helpers/optional.py             |   0
 .../masonite}/helpers/password.py             |   0
 {masonite => src/masonite}/helpers/routes.py  |   0
 {masonite => src/masonite}/helpers/sign.py    |   0
 {masonite => src/masonite}/helpers/static.py  |   0
 {masonite => src/masonite}/helpers/status.py  |   0
 .../masonite}/helpers/structures.py           |   0
 {masonite => src/masonite}/helpers/time.py    |   0
 .../masonite}/helpers/view_helpers.py         |   0
 {masonite => src/masonite}/hook.py            |   0
 .../masonite}/managers/AuthManager.py         |   4 +-
 .../masonite}/managers/BroadcastManager.py    |   6 +--
 .../masonite}/managers/CacheManager.py        |   6 +--
 .../masonite}/managers/MailManager.py         |   8 ++--
 .../masonite}/managers/Manager.py             |   6 +--
 .../masonite}/managers/QueueManager.py        |   6 +--
 .../masonite}/managers/SessionManager.py      |   6 +--
 .../masonite}/managers/StorageManager.py      |   6 +--
 .../masonite}/managers/UploadManager.py       |   6 +--
 .../masonite}/managers/__init__.py            |   0
 .../masonite}/middleware/CorsMiddleware.py    |   0
 .../masonite}/middleware/CsrfMiddleware.py    |   0
 .../middleware/MaintenanceModeMiddleware.py   |   0
 .../middleware/ResponseMiddleware.py          |   0
 .../middleware/SecureHeadersMiddleware.py     |   0
 .../masonite}/middleware/__init__.py          |   0
 {masonite => src/masonite}/packages.py        |   0
 {masonite => src/masonite}/provider.py        |   0
 .../masonite}/providers/AppProvider.py        |   0
 .../masonite}/providers/BroadcastProvider.py  |   0
 .../masonite}/providers/CacheProvider.py      |   0
 .../masonite}/providers/CorsProvider.py       |   0
 .../masonite}/providers/CsrfProvider.py       |   0
 .../masonite}/providers/HelpersProvider.py    |   0
 .../masonite}/providers/MailProvider.py       |   0
 .../masonite}/providers/QueueProvider.py      |   0
 .../masonite}/providers/RouteProvider.py      |   0
 .../masonite}/providers/SassProvider.py       |   0
 .../masonite}/providers/SessionProvider.py    |   0
 .../masonite}/providers/StatusCodeProvider.py |   0
 .../masonite}/providers/UploadProvider.py     |   0
 .../masonite}/providers/ViewProvider.py       |   0
 .../masonite}/providers/WhitenoiseProvider.py |   0
 .../masonite}/providers/__init__.py           |   0
 .../masonite}/queues/Queueable.py             |   0
 .../masonite}/queues/ShouldQueue.py           |   0
 {masonite => src/masonite}/queues/__init__.py |   0
 {masonite => src/masonite}/request.py         |   0
 {masonite => src/masonite}/response.py        |   0
 {masonite => src/masonite}/routes.py          |   0
 .../masonite}/snippets/__init__.py            |   0
 .../auth/controllers/ConfirmController.py     |   0
 .../auth/controllers/HomeController.py        |   0
 .../auth/controllers/LoginController.py       |   0
 .../auth/controllers/PasswordController.py    |   0
 .../auth/controllers/RegisterController.py    |   0
 .../snippets/auth/templates/auth/base.html    |   0
 .../snippets/auth/templates/auth/confirm.html |   0
 .../snippets/auth/templates/auth/error.html   |   0
 .../snippets/auth/templates/auth/forget.html  |   0
 .../snippets/auth/templates/auth/home.html    |   0
 .../snippets/auth/templates/auth/login.html   |   0
 .../auth/templates/auth/register.html         |   0
 .../snippets/auth/templates/auth/reset.html   |   0
 .../snippets/auth/templates/auth/verify.html  |   0
 .../auth/templates/auth/verifymail.html       |   0
 .../masonite}/snippets/exception.html         |   0
 .../masonite}/snippets/exceptions/__init__.py |   0
 .../snippets/exceptions/css/go-icon.png       | Bin
 .../snippets/exceptions/css/so-icon.png       | Bin
 .../snippets/exceptions/css/style.css         |   0
 .../masonite}/snippets/exceptions/dump.html   |   0
 .../snippets/exceptions/obj_loop.html         |   0
 .../migrations/create_failed_jobs_table.py    |   0
 .../masonite}/snippets/scaffold/command.html  |   0
 .../snippets/scaffold/controller.html         |   0
 .../scaffold/controller_resource.html         |   0
 .../masonite}/snippets/scaffold/job.html      |   0
 .../snippets/scaffold/middleware.html         |   0
 .../masonite}/snippets/scaffold/model.html    |   0
 .../masonite}/snippets/scaffold/provider.html |   0
 .../masonite}/snippets/scaffold/test.html     |   0
 .../snippets/scaffold/validator.html          |   0
 .../masonite}/snippets/scaffold/view.html     |   0
 .../masonite}/snippets/statuscode.html        |   0
 {masonite => src/masonite}/storage.py         |   0
 .../masonite}/testing/BaseRequest.py          |   0
 .../masonite}/testing/MockController.py       |   0
 .../masonite}/testing/MockJson.py             |   0
 .../masonite}/testing/MockRequest.py          |   0
 .../masonite}/testing/MockRoute.py            |   0
 .../masonite}/testing/TestCase.py             |   0
 .../masonite}/testing/__init__.py             |   0
 .../masonite}/testsuite/TestRequest.py        |   0
 .../masonite}/testsuite/TestRoute.py          |   0
 .../masonite}/testsuite/TestSuite.py          |   0
 .../masonite}/testsuite/__init__.py           |   0
 {masonite => src/masonite}/view.py            |   0
 storage/compiled/style.css                    |  41 ------------------
 tests/core/test_compile_sass.py               |   2 +-
 201 files changed, 45 insertions(+), 86 deletions(-)
 rename {masonite => src/masonite}/__init__.py (92%)
 rename {masonite => src/masonite}/__version__.py (100%)
 rename {masonite => src/masonite}/app.py (99%)
 rename {masonite => src/masonite}/auth/Auth.py (100%)
 rename {masonite => src/masonite}/auth/Csrf.py (100%)
 rename {masonite => src/masonite}/auth/MustVerifyEmail.py (100%)
 rename {masonite => src/masonite}/auth/Sign.py (100%)
 rename {masonite => src/masonite}/auth/__init__.py (100%)
 rename {masonite => src/masonite}/autoload.py (100%)
 rename {masonite => src/masonite}/commands/AuthCommand.py (100%)
 rename {masonite => src/masonite}/commands/BaseScaffoldCommand.py (100%)
 rename {masonite => src/masonite}/commands/CommandCommand.py (100%)
 rename {masonite => src/masonite}/commands/ControllerCommand.py (100%)
 rename {masonite => src/masonite}/commands/DownCommand.py (100%)
 rename {masonite => src/masonite}/commands/InfoCommand.py (100%)
 rename {masonite => src/masonite}/commands/InstallCommand.py (100%)
 rename {masonite => src/masonite}/commands/JobCommand.py (100%)
 rename {masonite => src/masonite}/commands/KeyCommand.py (100%)
 rename {masonite => src/masonite}/commands/MakeMigrationCommand.py (100%)
 rename {masonite => src/masonite}/commands/MiddlewareCommand.py (100%)
 rename {masonite => src/masonite}/commands/MigrateCommand.py (100%)
 rename {masonite => src/masonite}/commands/MigrateRefreshCommand.py (100%)
 rename {masonite => src/masonite}/commands/MigrateResetCommand.py (100%)
 rename {masonite => src/masonite}/commands/MigrateRollbackCommand.py (100%)
 rename {masonite => src/masonite}/commands/MigrateStatusCommand.py (100%)
 rename {masonite => src/masonite}/commands/ModelCommand.py (100%)
 rename {masonite => src/masonite}/commands/ModelDocstringCommand.py (100%)
 rename {masonite => src/masonite}/commands/ProviderCommand.py (100%)
 rename {masonite => src/masonite}/commands/PublishCommand.py (100%)
 rename {masonite => src/masonite}/commands/QueueTableCommand.py (100%)
 rename {masonite => src/masonite}/commands/QueueWorkCommand.py (100%)
 rename {masonite => src/masonite}/commands/RoutesCommand.py (100%)
 rename {masonite => src/masonite}/commands/SeedCommand.py (100%)
 rename {masonite => src/masonite}/commands/SeedRunCommand.py (100%)
 rename {masonite => src/masonite}/commands/ServeCommand.py (100%)
 rename {masonite => src/masonite}/commands/TestCommand.py (100%)
 rename {masonite => src/masonite}/commands/TinkerCommand.py (100%)
 rename {masonite => src/masonite}/commands/UpCommand.py (100%)
 rename {masonite => src/masonite}/commands/ViewCommand.py (100%)
 rename {masonite => src/masonite}/commands/__init__.py (100%)
 rename {masonite => src/masonite}/commands/_devserver.py (100%)
 rename {masonite => src/masonite}/contracts/AuthContract.py (100%)
 rename {masonite => src/masonite}/contracts/BroadcastContract.py (100%)
 rename {masonite => src/masonite}/contracts/CacheContract.py (100%)
 rename {masonite => src/masonite}/contracts/MailContract.py (100%)
 rename {masonite => src/masonite}/contracts/QueueContract.py (100%)
 rename {masonite => src/masonite}/contracts/SessionContract.py (100%)
 rename {masonite => src/masonite}/contracts/StorageContract.py (100%)
 rename {masonite => src/masonite}/contracts/UploadContract.py (100%)
 rename {masonite => src/masonite}/contracts/__init__.py (100%)
 rename {masonite => src/masonite}/contracts/managers/BroadcastManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/CacheManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/MailManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/QueueManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/SessionManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/StorageManagerContract.py (100%)
 rename {masonite => src/masonite}/contracts/managers/UploadManagerContract.py (100%)
 rename {masonite => src/masonite}/controllers/Controller.py (100%)
 rename {masonite => src/masonite}/controllers/__init__.py (100%)
 rename {masonite => src/masonite}/drivers/BaseDriver.py (100%)
 rename {masonite => src/masonite}/drivers/__init__.py (100%)
 rename {masonite => src/masonite}/drivers/authentication/AuthCookieDriver.py (100%)
 rename {masonite => src/masonite}/drivers/authentication/AuthJwtDriver.py (100%)
 rename {masonite => src/masonite}/drivers/broadcast/BroadcastAblyDriver.py (100%)
 rename {masonite => src/masonite}/drivers/broadcast/BroadcastPusherDriver.py (100%)
 rename {masonite => src/masonite}/drivers/cache/BaseCacheDriver.py (100%)
 rename {masonite => src/masonite}/drivers/cache/CacheDiskDriver.py (100%)
 rename {masonite => src/masonite}/drivers/cache/CacheRedisDriver.py (100%)
 rename {masonite => src/masonite}/drivers/mail/BaseMailDriver.py (100%)
 rename {masonite => src/masonite}/drivers/mail/MailLogDriver.py (100%)
 rename {masonite => src/masonite}/drivers/mail/MailMailgunDriver.py (100%)
 rename {masonite => src/masonite}/drivers/mail/MailSmtpDriver.py (100%)
 rename {masonite => src/masonite}/drivers/mail/MailTerminalDriver.py (100%)
 rename {masonite => src/masonite}/drivers/queue/BaseQueueDriver.py (100%)
 rename {masonite => src/masonite}/drivers/queue/QueueAmqpDriver.py (100%)
 rename {masonite => src/masonite}/drivers/queue/QueueAsyncDriver.py (100%)
 rename {masonite => src/masonite}/drivers/session/SessionCookieDriver.py (100%)
 rename {masonite => src/masonite}/drivers/session/SessionMemoryDriver.py (100%)
 rename {masonite => src/masonite}/drivers/storage/StorageDiskDriver.py (100%)
 rename {masonite => src/masonite}/drivers/upload/BaseUploadDriver.py (100%)
 rename {masonite => src/masonite}/drivers/upload/UploadDiskDriver.py (100%)
 rename {masonite => src/masonite}/drivers/upload/UploadS3Driver.py (100%)
 rename {masonite => src/masonite}/environment.py (100%)
 rename {masonite => src/masonite}/exception_handler.py (100%)
 rename {masonite => src/masonite}/exceptions.py (100%)
 rename {masonite => src/masonite}/helpers/Extendable.py (100%)
 rename {masonite => src/masonite}/helpers/__init__.py (100%)
 rename {masonite => src/masonite}/helpers/filesystem.py (100%)
 rename {masonite => src/masonite}/helpers/migrations.py (96%)
 rename {masonite => src/masonite}/helpers/misc.py (98%)
 rename {masonite => src/masonite}/helpers/optional.py (100%)
 rename {masonite => src/masonite}/helpers/password.py (100%)
 rename {masonite => src/masonite}/helpers/routes.py (100%)
 rename {masonite => src/masonite}/helpers/sign.py (100%)
 rename {masonite => src/masonite}/helpers/static.py (100%)
 rename {masonite => src/masonite}/helpers/status.py (100%)
 rename {masonite => src/masonite}/helpers/structures.py (100%)
 rename {masonite => src/masonite}/helpers/time.py (100%)
 rename {masonite => src/masonite}/helpers/view_helpers.py (100%)
 rename {masonite => src/masonite}/hook.py (100%)
 rename {masonite => src/masonite}/managers/AuthManager.py (71%)
 rename {masonite => src/masonite}/managers/BroadcastManager.py (66%)
 rename {masonite => src/masonite}/managers/CacheManager.py (64%)
 rename {masonite => src/masonite}/managers/MailManager.py (71%)
 rename {masonite => src/masonite}/managers/Manager.py (96%)
 rename {masonite => src/masonite}/managers/QueueManager.py (64%)
 rename {masonite => src/masonite}/managers/SessionManager.py (65%)
 rename {masonite => src/masonite}/managers/StorageManager.py (65%)
 rename {masonite => src/masonite}/managers/UploadManager.py (65%)
 rename {masonite => src/masonite}/managers/__init__.py (100%)
 rename {masonite => src/masonite}/middleware/CorsMiddleware.py (100%)
 rename {masonite => src/masonite}/middleware/CsrfMiddleware.py (100%)
 rename {masonite => src/masonite}/middleware/MaintenanceModeMiddleware.py (100%)
 rename {masonite => src/masonite}/middleware/ResponseMiddleware.py (100%)
 rename {masonite => src/masonite}/middleware/SecureHeadersMiddleware.py (100%)
 rename {masonite => src/masonite}/middleware/__init__.py (100%)
 rename {masonite => src/masonite}/packages.py (100%)
 rename {masonite => src/masonite}/provider.py (100%)
 rename {masonite => src/masonite}/providers/AppProvider.py (100%)
 rename {masonite => src/masonite}/providers/BroadcastProvider.py (100%)
 rename {masonite => src/masonite}/providers/CacheProvider.py (100%)
 rename {masonite => src/masonite}/providers/CorsProvider.py (100%)
 rename {masonite => src/masonite}/providers/CsrfProvider.py (100%)
 rename {masonite => src/masonite}/providers/HelpersProvider.py (100%)
 rename {masonite => src/masonite}/providers/MailProvider.py (100%)
 rename {masonite => src/masonite}/providers/QueueProvider.py (100%)
 rename {masonite => src/masonite}/providers/RouteProvider.py (100%)
 rename {masonite => src/masonite}/providers/SassProvider.py (100%)
 rename {masonite => src/masonite}/providers/SessionProvider.py (100%)
 rename {masonite => src/masonite}/providers/StatusCodeProvider.py (100%)
 rename {masonite => src/masonite}/providers/UploadProvider.py (100%)
 rename {masonite => src/masonite}/providers/ViewProvider.py (100%)
 rename {masonite => src/masonite}/providers/WhitenoiseProvider.py (100%)
 rename {masonite => src/masonite}/providers/__init__.py (100%)
 rename {masonite => src/masonite}/queues/Queueable.py (100%)
 rename {masonite => src/masonite}/queues/ShouldQueue.py (100%)
 rename {masonite => src/masonite}/queues/__init__.py (100%)
 rename {masonite => src/masonite}/request.py (100%)
 rename {masonite => src/masonite}/response.py (100%)
 rename {masonite => src/masonite}/routes.py (100%)
 rename {masonite => src/masonite}/snippets/__init__.py (100%)
 rename {masonite => src/masonite}/snippets/auth/controllers/ConfirmController.py (100%)
 rename {masonite => src/masonite}/snippets/auth/controllers/HomeController.py (100%)
 rename {masonite => src/masonite}/snippets/auth/controllers/LoginController.py (100%)
 rename {masonite => src/masonite}/snippets/auth/controllers/PasswordController.py (100%)
 rename {masonite => src/masonite}/snippets/auth/controllers/RegisterController.py (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/base.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/confirm.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/error.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/forget.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/home.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/login.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/register.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/reset.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/verify.html (100%)
 rename {masonite => src/masonite}/snippets/auth/templates/auth/verifymail.html (100%)
 rename {masonite => src/masonite}/snippets/exception.html (100%)
 rename {masonite => src/masonite}/snippets/exceptions/__init__.py (100%)
 rename {masonite => src/masonite}/snippets/exceptions/css/go-icon.png (100%)
 rename {masonite => src/masonite}/snippets/exceptions/css/so-icon.png (100%)
 rename {masonite => src/masonite}/snippets/exceptions/css/style.css (100%)
 rename {masonite => src/masonite}/snippets/exceptions/dump.html (100%)
 rename {masonite => src/masonite}/snippets/exceptions/obj_loop.html (100%)
 rename {masonite => src/masonite}/snippets/migrations/create_failed_jobs_table.py (100%)
 rename {masonite => src/masonite}/snippets/scaffold/command.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/controller.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/controller_resource.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/job.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/middleware.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/model.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/provider.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/test.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/validator.html (100%)
 rename {masonite => src/masonite}/snippets/scaffold/view.html (100%)
 rename {masonite => src/masonite}/snippets/statuscode.html (100%)
 rename {masonite => src/masonite}/storage.py (100%)
 rename {masonite => src/masonite}/testing/BaseRequest.py (100%)
 rename {masonite => src/masonite}/testing/MockController.py (100%)
 rename {masonite => src/masonite}/testing/MockJson.py (100%)
 rename {masonite => src/masonite}/testing/MockRequest.py (100%)
 rename {masonite => src/masonite}/testing/MockRoute.py (100%)
 rename {masonite => src/masonite}/testing/TestCase.py (100%)
 rename {masonite => src/masonite}/testing/__init__.py (100%)
 rename {masonite => src/masonite}/testsuite/TestRequest.py (100%)
 rename {masonite => src/masonite}/testsuite/TestRoute.py (100%)
 rename {masonite => src/masonite}/testsuite/TestSuite.py (100%)
 rename {masonite => src/masonite}/testsuite/__init__.py (100%)
 rename {masonite => src/masonite}/view.py (100%)
 delete mode 100644 storage/compiled/style.css

diff --git a/config/application.py b/config/application.py
index 74b0a6dd9..fe2cbaff3 100644
--- a/config/application.py
+++ b/config/application.py
@@ -2,7 +2,7 @@
 
 import os
 
-from masonite import env
+from src.masonite import env
 
 """Application Name
 This value is the name of your application. This value is used when the
diff --git a/config/auth.py b/config/auth.py
index 60f3f9e7e..93afc2b50 100644
--- a/config/auth.py
+++ b/config/auth.py
@@ -1,6 +1,6 @@
 """Authentication Settings."""
 
-from masonite import env
+from src.masonite import env
 
 from app.User import User
 
diff --git a/config/broadcast.py b/config/broadcast.py
index 74617c9a9..1b2d564f3 100644
--- a/config/broadcast.py
+++ b/config/broadcast.py
@@ -1,6 +1,6 @@
 """Broadcast Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """Broadcast Driver
 Realtime support is critical for any modern web application. Broadcast
diff --git a/config/cache.py b/config/cache.py
index 6ad80a4fe..589e04edf 100644
--- a/config/cache.py
+++ b/config/cache.py
@@ -1,6 +1,6 @@
 """Cache Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """Cache Driver
 Caching is a great way to gain an instant speed boost to your application.
diff --git a/config/database.py b/config/database.py
index 34fd356a6..2dc0ca4e9 100644
--- a/config/database.py
+++ b/config/database.py
@@ -2,8 +2,8 @@
 
 import logging
 
-from masonite import env
-from masonite.environment import LoadEnvironment
+from src.masonite import env
+from src.masonite.environment import LoadEnvironment
 from orator import DatabaseManager, Model
 
 """Load Environment Variables
diff --git a/config/mail.py b/config/mail.py
index c0c11f9d4..f6266063b 100644
--- a/config/mail.py
+++ b/config/mail.py
@@ -1,6 +1,6 @@
 """Mail Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """From Address
 This value will be used for the default address when sending emails from
diff --git a/config/middleware.py b/config/middleware.py
index 2d1f32274..125c6b3cc 100644
--- a/config/middleware.py
+++ b/config/middleware.py
@@ -1,6 +1,6 @@
 """Middleware Configuration Settings."""
 
-from masonite.middleware import (CorsMiddleware, ResponseMiddleware,
+from src.masonite.middleware import (CorsMiddleware, ResponseMiddleware,
                                  SecureHeadersMiddleware,
                                  MaintenanceModeMiddleware)
 
diff --git a/config/providers.py b/config/providers.py
index 0b0e795ca..3bc7c4404 100644
--- a/config/providers.py
+++ b/config/providers.py
@@ -1,6 +1,6 @@
 """Providers Configuration File."""
 
-from masonite.providers import (AppProvider, BroadcastProvider, CacheProvider,
+from src.masonite.providers import (AppProvider, BroadcastProvider, CacheProvider,
                                 CsrfProvider, HelpersProvider, MailProvider,
                                 QueueProvider, RouteProvider, SassProvider,
                                 SessionProvider, StatusCodeProvider,
diff --git a/config/queue.py b/config/queue.py
index 109d49b85..fcd586948 100644
--- a/config/queue.py
+++ b/config/queue.py
@@ -1,6 +1,6 @@
 """Queue Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """Queue Driver
 Queues are an excellent way to send intensive and time consuming tasks
diff --git a/config/session.py b/config/session.py
index 8ea9c1537..3f9d18442 100644
--- a/config/session.py
+++ b/config/session.py
@@ -1,6 +1,6 @@
 """Session Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """Session Driver
 Sessions are able to be linked to an individual user and carry data from
diff --git a/config/storage.py b/config/storage.py
index f6b856ba6..8d30ec820 100644
--- a/config/storage.py
+++ b/config/storage.py
@@ -1,6 +1,6 @@
 """Storage Settings."""
 
-from masonite import env
+from src.masonite import env
 
 """Storage Driver
 The default driver you will like to use for storing uploads. You may add
diff --git a/masonite/__init__.py b/src/masonite/__init__.py
similarity index 92%
rename from masonite/__init__.py
rename to src/masonite/__init__.py
index 49e68acf7..988c25066 100644
--- a/masonite/__init__.py
+++ b/src/masonite/__init__.py
@@ -4,7 +4,7 @@
 from .managers.QueueManager import Queue
 from .managers.SessionManager import Session
 from .managers.UploadManager import Upload
-from masonite.environment import env
+from .environment import env
 from .__version__ import (__title__, __description__, __url__,
                           __version__, __author__, __author_email__,
                           __licence__)
diff --git a/masonite/__version__.py b/src/masonite/__version__.py
similarity index 100%
rename from masonite/__version__.py
rename to src/masonite/__version__.py
diff --git a/masonite/app.py b/src/masonite/app.py
similarity index 99%
rename from masonite/app.py
rename to src/masonite/app.py
index ae18a7e73..18d2a76ee 100644
--- a/masonite/app.py
+++ b/src/masonite/app.py
@@ -2,7 +2,7 @@
 
 import inspect
 
-from masonite.exceptions import (ContainerError,
+from .exceptions import (ContainerError,
                                  MissingContainerBindingNotFound,
                                  StrictContainerException)
 
diff --git a/masonite/auth/Auth.py b/src/masonite/auth/Auth.py
similarity index 100%
rename from masonite/auth/Auth.py
rename to src/masonite/auth/Auth.py
diff --git a/masonite/auth/Csrf.py b/src/masonite/auth/Csrf.py
similarity index 100%
rename from masonite/auth/Csrf.py
rename to src/masonite/auth/Csrf.py
diff --git a/masonite/auth/MustVerifyEmail.py b/src/masonite/auth/MustVerifyEmail.py
similarity index 100%
rename from masonite/auth/MustVerifyEmail.py
rename to src/masonite/auth/MustVerifyEmail.py
diff --git a/masonite/auth/Sign.py b/src/masonite/auth/Sign.py
similarity index 100%
rename from masonite/auth/Sign.py
rename to src/masonite/auth/Sign.py
diff --git a/masonite/auth/__init__.py b/src/masonite/auth/__init__.py
similarity index 100%
rename from masonite/auth/__init__.py
rename to src/masonite/auth/__init__.py
diff --git a/masonite/autoload.py b/src/masonite/autoload.py
similarity index 100%
rename from masonite/autoload.py
rename to src/masonite/autoload.py
diff --git a/masonite/commands/AuthCommand.py b/src/masonite/commands/AuthCommand.py
similarity index 100%
rename from masonite/commands/AuthCommand.py
rename to src/masonite/commands/AuthCommand.py
diff --git a/masonite/commands/BaseScaffoldCommand.py b/src/masonite/commands/BaseScaffoldCommand.py
similarity index 100%
rename from masonite/commands/BaseScaffoldCommand.py
rename to src/masonite/commands/BaseScaffoldCommand.py
diff --git a/masonite/commands/CommandCommand.py b/src/masonite/commands/CommandCommand.py
similarity index 100%
rename from masonite/commands/CommandCommand.py
rename to src/masonite/commands/CommandCommand.py
diff --git a/masonite/commands/ControllerCommand.py b/src/masonite/commands/ControllerCommand.py
similarity index 100%
rename from masonite/commands/ControllerCommand.py
rename to src/masonite/commands/ControllerCommand.py
diff --git a/masonite/commands/DownCommand.py b/src/masonite/commands/DownCommand.py
similarity index 100%
rename from masonite/commands/DownCommand.py
rename to src/masonite/commands/DownCommand.py
diff --git a/masonite/commands/InfoCommand.py b/src/masonite/commands/InfoCommand.py
similarity index 100%
rename from masonite/commands/InfoCommand.py
rename to src/masonite/commands/InfoCommand.py
diff --git a/masonite/commands/InstallCommand.py b/src/masonite/commands/InstallCommand.py
similarity index 100%
rename from masonite/commands/InstallCommand.py
rename to src/masonite/commands/InstallCommand.py
diff --git a/masonite/commands/JobCommand.py b/src/masonite/commands/JobCommand.py
similarity index 100%
rename from masonite/commands/JobCommand.py
rename to src/masonite/commands/JobCommand.py
diff --git a/masonite/commands/KeyCommand.py b/src/masonite/commands/KeyCommand.py
similarity index 100%
rename from masonite/commands/KeyCommand.py
rename to src/masonite/commands/KeyCommand.py
diff --git a/masonite/commands/MakeMigrationCommand.py b/src/masonite/commands/MakeMigrationCommand.py
similarity index 100%
rename from masonite/commands/MakeMigrationCommand.py
rename to src/masonite/commands/MakeMigrationCommand.py
diff --git a/masonite/commands/MiddlewareCommand.py b/src/masonite/commands/MiddlewareCommand.py
similarity index 100%
rename from masonite/commands/MiddlewareCommand.py
rename to src/masonite/commands/MiddlewareCommand.py
diff --git a/masonite/commands/MigrateCommand.py b/src/masonite/commands/MigrateCommand.py
similarity index 100%
rename from masonite/commands/MigrateCommand.py
rename to src/masonite/commands/MigrateCommand.py
diff --git a/masonite/commands/MigrateRefreshCommand.py b/src/masonite/commands/MigrateRefreshCommand.py
similarity index 100%
rename from masonite/commands/MigrateRefreshCommand.py
rename to src/masonite/commands/MigrateRefreshCommand.py
diff --git a/masonite/commands/MigrateResetCommand.py b/src/masonite/commands/MigrateResetCommand.py
similarity index 100%
rename from masonite/commands/MigrateResetCommand.py
rename to src/masonite/commands/MigrateResetCommand.py
diff --git a/masonite/commands/MigrateRollbackCommand.py b/src/masonite/commands/MigrateRollbackCommand.py
similarity index 100%
rename from masonite/commands/MigrateRollbackCommand.py
rename to src/masonite/commands/MigrateRollbackCommand.py
diff --git a/masonite/commands/MigrateStatusCommand.py b/src/masonite/commands/MigrateStatusCommand.py
similarity index 100%
rename from masonite/commands/MigrateStatusCommand.py
rename to src/masonite/commands/MigrateStatusCommand.py
diff --git a/masonite/commands/ModelCommand.py b/src/masonite/commands/ModelCommand.py
similarity index 100%
rename from masonite/commands/ModelCommand.py
rename to src/masonite/commands/ModelCommand.py
diff --git a/masonite/commands/ModelDocstringCommand.py b/src/masonite/commands/ModelDocstringCommand.py
similarity index 100%
rename from masonite/commands/ModelDocstringCommand.py
rename to src/masonite/commands/ModelDocstringCommand.py
diff --git a/masonite/commands/ProviderCommand.py b/src/masonite/commands/ProviderCommand.py
similarity index 100%
rename from masonite/commands/ProviderCommand.py
rename to src/masonite/commands/ProviderCommand.py
diff --git a/masonite/commands/PublishCommand.py b/src/masonite/commands/PublishCommand.py
similarity index 100%
rename from masonite/commands/PublishCommand.py
rename to src/masonite/commands/PublishCommand.py
diff --git a/masonite/commands/QueueTableCommand.py b/src/masonite/commands/QueueTableCommand.py
similarity index 100%
rename from masonite/commands/QueueTableCommand.py
rename to src/masonite/commands/QueueTableCommand.py
diff --git a/masonite/commands/QueueWorkCommand.py b/src/masonite/commands/QueueWorkCommand.py
similarity index 100%
rename from masonite/commands/QueueWorkCommand.py
rename to src/masonite/commands/QueueWorkCommand.py
diff --git a/masonite/commands/RoutesCommand.py b/src/masonite/commands/RoutesCommand.py
similarity index 100%
rename from masonite/commands/RoutesCommand.py
rename to src/masonite/commands/RoutesCommand.py
diff --git a/masonite/commands/SeedCommand.py b/src/masonite/commands/SeedCommand.py
similarity index 100%
rename from masonite/commands/SeedCommand.py
rename to src/masonite/commands/SeedCommand.py
diff --git a/masonite/commands/SeedRunCommand.py b/src/masonite/commands/SeedRunCommand.py
similarity index 100%
rename from masonite/commands/SeedRunCommand.py
rename to src/masonite/commands/SeedRunCommand.py
diff --git a/masonite/commands/ServeCommand.py b/src/masonite/commands/ServeCommand.py
similarity index 100%
rename from masonite/commands/ServeCommand.py
rename to src/masonite/commands/ServeCommand.py
diff --git a/masonite/commands/TestCommand.py b/src/masonite/commands/TestCommand.py
similarity index 100%
rename from masonite/commands/TestCommand.py
rename to src/masonite/commands/TestCommand.py
diff --git a/masonite/commands/TinkerCommand.py b/src/masonite/commands/TinkerCommand.py
similarity index 100%
rename from masonite/commands/TinkerCommand.py
rename to src/masonite/commands/TinkerCommand.py
diff --git a/masonite/commands/UpCommand.py b/src/masonite/commands/UpCommand.py
similarity index 100%
rename from masonite/commands/UpCommand.py
rename to src/masonite/commands/UpCommand.py
diff --git a/masonite/commands/ViewCommand.py b/src/masonite/commands/ViewCommand.py
similarity index 100%
rename from masonite/commands/ViewCommand.py
rename to src/masonite/commands/ViewCommand.py
diff --git a/masonite/commands/__init__.py b/src/masonite/commands/__init__.py
similarity index 100%
rename from masonite/commands/__init__.py
rename to src/masonite/commands/__init__.py
diff --git a/masonite/commands/_devserver.py b/src/masonite/commands/_devserver.py
similarity index 100%
rename from masonite/commands/_devserver.py
rename to src/masonite/commands/_devserver.py
diff --git a/masonite/contracts/AuthContract.py b/src/masonite/contracts/AuthContract.py
similarity index 100%
rename from masonite/contracts/AuthContract.py
rename to src/masonite/contracts/AuthContract.py
diff --git a/masonite/contracts/BroadcastContract.py b/src/masonite/contracts/BroadcastContract.py
similarity index 100%
rename from masonite/contracts/BroadcastContract.py
rename to src/masonite/contracts/BroadcastContract.py
diff --git a/masonite/contracts/CacheContract.py b/src/masonite/contracts/CacheContract.py
similarity index 100%
rename from masonite/contracts/CacheContract.py
rename to src/masonite/contracts/CacheContract.py
diff --git a/masonite/contracts/MailContract.py b/src/masonite/contracts/MailContract.py
similarity index 100%
rename from masonite/contracts/MailContract.py
rename to src/masonite/contracts/MailContract.py
diff --git a/masonite/contracts/QueueContract.py b/src/masonite/contracts/QueueContract.py
similarity index 100%
rename from masonite/contracts/QueueContract.py
rename to src/masonite/contracts/QueueContract.py
diff --git a/masonite/contracts/SessionContract.py b/src/masonite/contracts/SessionContract.py
similarity index 100%
rename from masonite/contracts/SessionContract.py
rename to src/masonite/contracts/SessionContract.py
diff --git a/masonite/contracts/StorageContract.py b/src/masonite/contracts/StorageContract.py
similarity index 100%
rename from masonite/contracts/StorageContract.py
rename to src/masonite/contracts/StorageContract.py
diff --git a/masonite/contracts/UploadContract.py b/src/masonite/contracts/UploadContract.py
similarity index 100%
rename from masonite/contracts/UploadContract.py
rename to src/masonite/contracts/UploadContract.py
diff --git a/masonite/contracts/__init__.py b/src/masonite/contracts/__init__.py
similarity index 100%
rename from masonite/contracts/__init__.py
rename to src/masonite/contracts/__init__.py
diff --git a/masonite/contracts/managers/BroadcastManagerContract.py b/src/masonite/contracts/managers/BroadcastManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/BroadcastManagerContract.py
rename to src/masonite/contracts/managers/BroadcastManagerContract.py
diff --git a/masonite/contracts/managers/CacheManagerContract.py b/src/masonite/contracts/managers/CacheManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/CacheManagerContract.py
rename to src/masonite/contracts/managers/CacheManagerContract.py
diff --git a/masonite/contracts/managers/MailManagerContract.py b/src/masonite/contracts/managers/MailManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/MailManagerContract.py
rename to src/masonite/contracts/managers/MailManagerContract.py
diff --git a/masonite/contracts/managers/QueueManagerContract.py b/src/masonite/contracts/managers/QueueManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/QueueManagerContract.py
rename to src/masonite/contracts/managers/QueueManagerContract.py
diff --git a/masonite/contracts/managers/SessionManagerContract.py b/src/masonite/contracts/managers/SessionManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/SessionManagerContract.py
rename to src/masonite/contracts/managers/SessionManagerContract.py
diff --git a/masonite/contracts/managers/StorageManagerContract.py b/src/masonite/contracts/managers/StorageManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/StorageManagerContract.py
rename to src/masonite/contracts/managers/StorageManagerContract.py
diff --git a/masonite/contracts/managers/UploadManagerContract.py b/src/masonite/contracts/managers/UploadManagerContract.py
similarity index 100%
rename from masonite/contracts/managers/UploadManagerContract.py
rename to src/masonite/contracts/managers/UploadManagerContract.py
diff --git a/masonite/controllers/Controller.py b/src/masonite/controllers/Controller.py
similarity index 100%
rename from masonite/controllers/Controller.py
rename to src/masonite/controllers/Controller.py
diff --git a/masonite/controllers/__init__.py b/src/masonite/controllers/__init__.py
similarity index 100%
rename from masonite/controllers/__init__.py
rename to src/masonite/controllers/__init__.py
diff --git a/masonite/drivers/BaseDriver.py b/src/masonite/drivers/BaseDriver.py
similarity index 100%
rename from masonite/drivers/BaseDriver.py
rename to src/masonite/drivers/BaseDriver.py
diff --git a/masonite/drivers/__init__.py b/src/masonite/drivers/__init__.py
similarity index 100%
rename from masonite/drivers/__init__.py
rename to src/masonite/drivers/__init__.py
diff --git a/masonite/drivers/authentication/AuthCookieDriver.py b/src/masonite/drivers/authentication/AuthCookieDriver.py
similarity index 100%
rename from masonite/drivers/authentication/AuthCookieDriver.py
rename to src/masonite/drivers/authentication/AuthCookieDriver.py
diff --git a/masonite/drivers/authentication/AuthJwtDriver.py b/src/masonite/drivers/authentication/AuthJwtDriver.py
similarity index 100%
rename from masonite/drivers/authentication/AuthJwtDriver.py
rename to src/masonite/drivers/authentication/AuthJwtDriver.py
diff --git a/masonite/drivers/broadcast/BroadcastAblyDriver.py b/src/masonite/drivers/broadcast/BroadcastAblyDriver.py
similarity index 100%
rename from masonite/drivers/broadcast/BroadcastAblyDriver.py
rename to src/masonite/drivers/broadcast/BroadcastAblyDriver.py
diff --git a/masonite/drivers/broadcast/BroadcastPusherDriver.py b/src/masonite/drivers/broadcast/BroadcastPusherDriver.py
similarity index 100%
rename from masonite/drivers/broadcast/BroadcastPusherDriver.py
rename to src/masonite/drivers/broadcast/BroadcastPusherDriver.py
diff --git a/masonite/drivers/cache/BaseCacheDriver.py b/src/masonite/drivers/cache/BaseCacheDriver.py
similarity index 100%
rename from masonite/drivers/cache/BaseCacheDriver.py
rename to src/masonite/drivers/cache/BaseCacheDriver.py
diff --git a/masonite/drivers/cache/CacheDiskDriver.py b/src/masonite/drivers/cache/CacheDiskDriver.py
similarity index 100%
rename from masonite/drivers/cache/CacheDiskDriver.py
rename to src/masonite/drivers/cache/CacheDiskDriver.py
diff --git a/masonite/drivers/cache/CacheRedisDriver.py b/src/masonite/drivers/cache/CacheRedisDriver.py
similarity index 100%
rename from masonite/drivers/cache/CacheRedisDriver.py
rename to src/masonite/drivers/cache/CacheRedisDriver.py
diff --git a/masonite/drivers/mail/BaseMailDriver.py b/src/masonite/drivers/mail/BaseMailDriver.py
similarity index 100%
rename from masonite/drivers/mail/BaseMailDriver.py
rename to src/masonite/drivers/mail/BaseMailDriver.py
diff --git a/masonite/drivers/mail/MailLogDriver.py b/src/masonite/drivers/mail/MailLogDriver.py
similarity index 100%
rename from masonite/drivers/mail/MailLogDriver.py
rename to src/masonite/drivers/mail/MailLogDriver.py
diff --git a/masonite/drivers/mail/MailMailgunDriver.py b/src/masonite/drivers/mail/MailMailgunDriver.py
similarity index 100%
rename from masonite/drivers/mail/MailMailgunDriver.py
rename to src/masonite/drivers/mail/MailMailgunDriver.py
diff --git a/masonite/drivers/mail/MailSmtpDriver.py b/src/masonite/drivers/mail/MailSmtpDriver.py
similarity index 100%
rename from masonite/drivers/mail/MailSmtpDriver.py
rename to src/masonite/drivers/mail/MailSmtpDriver.py
diff --git a/masonite/drivers/mail/MailTerminalDriver.py b/src/masonite/drivers/mail/MailTerminalDriver.py
similarity index 100%
rename from masonite/drivers/mail/MailTerminalDriver.py
rename to src/masonite/drivers/mail/MailTerminalDriver.py
diff --git a/masonite/drivers/queue/BaseQueueDriver.py b/src/masonite/drivers/queue/BaseQueueDriver.py
similarity index 100%
rename from masonite/drivers/queue/BaseQueueDriver.py
rename to src/masonite/drivers/queue/BaseQueueDriver.py
diff --git a/masonite/drivers/queue/QueueAmqpDriver.py b/src/masonite/drivers/queue/QueueAmqpDriver.py
similarity index 100%
rename from masonite/drivers/queue/QueueAmqpDriver.py
rename to src/masonite/drivers/queue/QueueAmqpDriver.py
diff --git a/masonite/drivers/queue/QueueAsyncDriver.py b/src/masonite/drivers/queue/QueueAsyncDriver.py
similarity index 100%
rename from masonite/drivers/queue/QueueAsyncDriver.py
rename to src/masonite/drivers/queue/QueueAsyncDriver.py
diff --git a/masonite/drivers/session/SessionCookieDriver.py b/src/masonite/drivers/session/SessionCookieDriver.py
similarity index 100%
rename from masonite/drivers/session/SessionCookieDriver.py
rename to src/masonite/drivers/session/SessionCookieDriver.py
diff --git a/masonite/drivers/session/SessionMemoryDriver.py b/src/masonite/drivers/session/SessionMemoryDriver.py
similarity index 100%
rename from masonite/drivers/session/SessionMemoryDriver.py
rename to src/masonite/drivers/session/SessionMemoryDriver.py
diff --git a/masonite/drivers/storage/StorageDiskDriver.py b/src/masonite/drivers/storage/StorageDiskDriver.py
similarity index 100%
rename from masonite/drivers/storage/StorageDiskDriver.py
rename to src/masonite/drivers/storage/StorageDiskDriver.py
diff --git a/masonite/drivers/upload/BaseUploadDriver.py b/src/masonite/drivers/upload/BaseUploadDriver.py
similarity index 100%
rename from masonite/drivers/upload/BaseUploadDriver.py
rename to src/masonite/drivers/upload/BaseUploadDriver.py
diff --git a/masonite/drivers/upload/UploadDiskDriver.py b/src/masonite/drivers/upload/UploadDiskDriver.py
similarity index 100%
rename from masonite/drivers/upload/UploadDiskDriver.py
rename to src/masonite/drivers/upload/UploadDiskDriver.py
diff --git a/masonite/drivers/upload/UploadS3Driver.py b/src/masonite/drivers/upload/UploadS3Driver.py
similarity index 100%
rename from masonite/drivers/upload/UploadS3Driver.py
rename to src/masonite/drivers/upload/UploadS3Driver.py
diff --git a/masonite/environment.py b/src/masonite/environment.py
similarity index 100%
rename from masonite/environment.py
rename to src/masonite/environment.py
diff --git a/masonite/exception_handler.py b/src/masonite/exception_handler.py
similarity index 100%
rename from masonite/exception_handler.py
rename to src/masonite/exception_handler.py
diff --git a/masonite/exceptions.py b/src/masonite/exceptions.py
similarity index 100%
rename from masonite/exceptions.py
rename to src/masonite/exceptions.py
diff --git a/masonite/helpers/Extendable.py b/src/masonite/helpers/Extendable.py
similarity index 100%
rename from masonite/helpers/Extendable.py
rename to src/masonite/helpers/Extendable.py
diff --git a/masonite/helpers/__init__.py b/src/masonite/helpers/__init__.py
similarity index 100%
rename from masonite/helpers/__init__.py
rename to src/masonite/helpers/__init__.py
diff --git a/masonite/helpers/filesystem.py b/src/masonite/helpers/filesystem.py
similarity index 100%
rename from masonite/helpers/filesystem.py
rename to src/masonite/helpers/filesystem.py
diff --git a/masonite/helpers/migrations.py b/src/masonite/helpers/migrations.py
similarity index 96%
rename from masonite/helpers/migrations.py
rename to src/masonite/helpers/migrations.py
index 5fa629718..467fa6deb 100644
--- a/masonite/helpers/migrations.py
+++ b/src/masonite/helpers/migrations.py
@@ -1,7 +1,7 @@
 import subprocess
 
-from masonite.helpers import config, HasColoredCommands
-from masonite.packages import add_venv_site_packages
+from ..helpers import config, HasColoredCommands
+from ..packages import add_venv_site_packages
 from orator.migrations import DatabaseMigrationRepository, Migrator
 
 
diff --git a/masonite/helpers/misc.py b/src/masonite/helpers/misc.py
similarity index 98%
rename from masonite/helpers/misc.py
rename to src/masonite/helpers/misc.py
index 1bcd876e6..29464c05a 100644
--- a/masonite/helpers/misc.py
+++ b/src/masonite/helpers/misc.py
@@ -4,7 +4,7 @@
 import string
 import warnings
 
-from masonite.exceptions import AmbiguousError
+from ..exceptions import AmbiguousError
 
 
 def random_string(length=4):
diff --git a/masonite/helpers/optional.py b/src/masonite/helpers/optional.py
similarity index 100%
rename from masonite/helpers/optional.py
rename to src/masonite/helpers/optional.py
diff --git a/masonite/helpers/password.py b/src/masonite/helpers/password.py
similarity index 100%
rename from masonite/helpers/password.py
rename to src/masonite/helpers/password.py
diff --git a/masonite/helpers/routes.py b/src/masonite/helpers/routes.py
similarity index 100%
rename from masonite/helpers/routes.py
rename to src/masonite/helpers/routes.py
diff --git a/masonite/helpers/sign.py b/src/masonite/helpers/sign.py
similarity index 100%
rename from masonite/helpers/sign.py
rename to src/masonite/helpers/sign.py
diff --git a/masonite/helpers/static.py b/src/masonite/helpers/static.py
similarity index 100%
rename from masonite/helpers/static.py
rename to src/masonite/helpers/static.py
diff --git a/masonite/helpers/status.py b/src/masonite/helpers/status.py
similarity index 100%
rename from masonite/helpers/status.py
rename to src/masonite/helpers/status.py
diff --git a/masonite/helpers/structures.py b/src/masonite/helpers/structures.py
similarity index 100%
rename from masonite/helpers/structures.py
rename to src/masonite/helpers/structures.py
diff --git a/masonite/helpers/time.py b/src/masonite/helpers/time.py
similarity index 100%
rename from masonite/helpers/time.py
rename to src/masonite/helpers/time.py
diff --git a/masonite/helpers/view_helpers.py b/src/masonite/helpers/view_helpers.py
similarity index 100%
rename from masonite/helpers/view_helpers.py
rename to src/masonite/helpers/view_helpers.py
diff --git a/masonite/hook.py b/src/masonite/hook.py
similarity index 100%
rename from masonite/hook.py
rename to src/masonite/hook.py
diff --git a/masonite/managers/AuthManager.py b/src/masonite/managers/AuthManager.py
similarity index 71%
rename from masonite/managers/AuthManager.py
rename to src/masonite/managers/AuthManager.py
index f3b28de38..2c27a140b 100644
--- a/masonite/managers/AuthManager.py
+++ b/src/masonite/managers/AuthManager.py
@@ -1,13 +1,13 @@
 """Auth Manager Module."""
 
-from masonite.managers import Manager
+from .Manager import Manager
 
 
 class AuthManager(Manager):
     """Manages all auth drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'auth'
diff --git a/masonite/managers/BroadcastManager.py b/src/masonite/managers/BroadcastManager.py
similarity index 66%
rename from masonite/managers/BroadcastManager.py
rename to src/masonite/managers/BroadcastManager.py
index 075162cf0..844fe8c26 100644
--- a/masonite/managers/BroadcastManager.py
+++ b/src/masonite/managers/BroadcastManager.py
@@ -1,14 +1,14 @@
 """Broadcast Manager Module."""
 
-from masonite.contracts import BroadcastManagerContract
-from masonite.managers import Manager
+from ..contracts import BroadcastManagerContract
+from .Manager import Manager
 
 
 class BroadcastManager(Manager, BroadcastManagerContract):
     """Manages all broadcast drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'broadcast'
diff --git a/masonite/managers/CacheManager.py b/src/masonite/managers/CacheManager.py
similarity index 64%
rename from masonite/managers/CacheManager.py
rename to src/masonite/managers/CacheManager.py
index e73a50d2a..83c2e5027 100644
--- a/masonite/managers/CacheManager.py
+++ b/src/masonite/managers/CacheManager.py
@@ -1,14 +1,14 @@
 """Cache Manager."""
 
-from masonite.contracts import CacheManagerContract
-from masonite.managers import Manager
+from ..contracts import CacheManagerContract
+from .Manager import Manager
 
 
 class CacheManager(Manager, CacheManagerContract):
     """Manages all cache drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'cache'
diff --git a/masonite/managers/MailManager.py b/src/masonite/managers/MailManager.py
similarity index 71%
rename from masonite/managers/MailManager.py
rename to src/masonite/managers/MailManager.py
index ee22b5961..343e45519 100644
--- a/masonite/managers/MailManager.py
+++ b/src/masonite/managers/MailManager.py
@@ -1,15 +1,15 @@
 """Mail Manager Module."""
 
-from masonite.contracts import MailManagerContract
-from masonite.managers import Manager
-from masonite.helpers import config
+from ..contracts import MailManagerContract
+from .Manager import Manager
+from ..helpers import config
 
 
 class MailManager(Manager, MailManagerContract):
     """Manages all mail drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'mail'
diff --git a/masonite/managers/Manager.py b/src/masonite/managers/Manager.py
similarity index 96%
rename from masonite/managers/Manager.py
rename to src/masonite/managers/Manager.py
index 85bdb86b1..76c76c083 100644
--- a/masonite/managers/Manager.py
+++ b/src/masonite/managers/Manager.py
@@ -2,12 +2,12 @@
 
 import inspect
 
-from masonite.exceptions import (DriverNotFound,
+from ..exceptions import (DriverNotFound,
                                  MissingContainerBindingNotFound,
                                  UnacceptableDriverType)
 
-from masonite.app import App
-from masonite.helpers import config
+from ..app import App
+from ..helpers import config
 
 
 class Manager:
diff --git a/masonite/managers/QueueManager.py b/src/masonite/managers/QueueManager.py
similarity index 64%
rename from masonite/managers/QueueManager.py
rename to src/masonite/managers/QueueManager.py
index 18e2952c8..5f3b8d0a4 100644
--- a/masonite/managers/QueueManager.py
+++ b/src/masonite/managers/QueueManager.py
@@ -1,14 +1,14 @@
 """Queue Manager Module."""
 
-from masonite.contracts import QueueManagerContract
-from masonite.managers import Manager
+from ..contracts import QueueManagerContract
+from .Manager import Manager
 
 
 class QueueManager(Manager, QueueManagerContract):
     """Manages all queue drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'queue'
diff --git a/masonite/managers/SessionManager.py b/src/masonite/managers/SessionManager.py
similarity index 65%
rename from masonite/managers/SessionManager.py
rename to src/masonite/managers/SessionManager.py
index fcfaae658..8880e2c0b 100644
--- a/masonite/managers/SessionManager.py
+++ b/src/masonite/managers/SessionManager.py
@@ -1,14 +1,14 @@
 """Session Manager Module."""
 
-from masonite.contracts import SessionManagerContract
-from masonite.managers import Manager
+from ..contracts import SessionManagerContract
+from .Manager import Manager
 
 
 class SessionManager(Manager, SessionManagerContract):
     """Manages all session drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'session'
diff --git a/masonite/managers/StorageManager.py b/src/masonite/managers/StorageManager.py
similarity index 65%
rename from masonite/managers/StorageManager.py
rename to src/masonite/managers/StorageManager.py
index 0c1e9f8b7..d1bc87d53 100644
--- a/masonite/managers/StorageManager.py
+++ b/src/masonite/managers/StorageManager.py
@@ -1,14 +1,14 @@
 """Queue Manager Module."""
 
-from masonite.contracts import StorageManagerContract
-from masonite.managers import Manager
+from ..contracts import StorageManagerContract
+from .Manager import Manager
 
 
 class StorageManager(Manager, StorageManagerContract):
     """Manages all queue drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'storage'
diff --git a/masonite/managers/UploadManager.py b/src/masonite/managers/UploadManager.py
similarity index 65%
rename from masonite/managers/UploadManager.py
rename to src/masonite/managers/UploadManager.py
index 70df597cd..200949955 100644
--- a/masonite/managers/UploadManager.py
+++ b/src/masonite/managers/UploadManager.py
@@ -1,14 +1,14 @@
 """Upload Manager Module."""
 
-from masonite.contracts import UploadManagerContract
-from masonite.managers import Manager
+from ..contracts import UploadManagerContract
+from .Manager import Manager
 
 
 class UploadManager(Manager, UploadManagerContract):
     """Manages all upload drivers.
 
     Arguments:
-        Manager {masonite.managers.Manager} -- The base Manager class.
+        Manager {from .managers.Manager} -- The base Manager class.
     """
 
     config = 'storage'
diff --git a/masonite/managers/__init__.py b/src/masonite/managers/__init__.py
similarity index 100%
rename from masonite/managers/__init__.py
rename to src/masonite/managers/__init__.py
diff --git a/masonite/middleware/CorsMiddleware.py b/src/masonite/middleware/CorsMiddleware.py
similarity index 100%
rename from masonite/middleware/CorsMiddleware.py
rename to src/masonite/middleware/CorsMiddleware.py
diff --git a/masonite/middleware/CsrfMiddleware.py b/src/masonite/middleware/CsrfMiddleware.py
similarity index 100%
rename from masonite/middleware/CsrfMiddleware.py
rename to src/masonite/middleware/CsrfMiddleware.py
diff --git a/masonite/middleware/MaintenanceModeMiddleware.py b/src/masonite/middleware/MaintenanceModeMiddleware.py
similarity index 100%
rename from masonite/middleware/MaintenanceModeMiddleware.py
rename to src/masonite/middleware/MaintenanceModeMiddleware.py
diff --git a/masonite/middleware/ResponseMiddleware.py b/src/masonite/middleware/ResponseMiddleware.py
similarity index 100%
rename from masonite/middleware/ResponseMiddleware.py
rename to src/masonite/middleware/ResponseMiddleware.py
diff --git a/masonite/middleware/SecureHeadersMiddleware.py b/src/masonite/middleware/SecureHeadersMiddleware.py
similarity index 100%
rename from masonite/middleware/SecureHeadersMiddleware.py
rename to src/masonite/middleware/SecureHeadersMiddleware.py
diff --git a/masonite/middleware/__init__.py b/src/masonite/middleware/__init__.py
similarity index 100%
rename from masonite/middleware/__init__.py
rename to src/masonite/middleware/__init__.py
diff --git a/masonite/packages.py b/src/masonite/packages.py
similarity index 100%
rename from masonite/packages.py
rename to src/masonite/packages.py
diff --git a/masonite/provider.py b/src/masonite/provider.py
similarity index 100%
rename from masonite/provider.py
rename to src/masonite/provider.py
diff --git a/masonite/providers/AppProvider.py b/src/masonite/providers/AppProvider.py
similarity index 100%
rename from masonite/providers/AppProvider.py
rename to src/masonite/providers/AppProvider.py
diff --git a/masonite/providers/BroadcastProvider.py b/src/masonite/providers/BroadcastProvider.py
similarity index 100%
rename from masonite/providers/BroadcastProvider.py
rename to src/masonite/providers/BroadcastProvider.py
diff --git a/masonite/providers/CacheProvider.py b/src/masonite/providers/CacheProvider.py
similarity index 100%
rename from masonite/providers/CacheProvider.py
rename to src/masonite/providers/CacheProvider.py
diff --git a/masonite/providers/CorsProvider.py b/src/masonite/providers/CorsProvider.py
similarity index 100%
rename from masonite/providers/CorsProvider.py
rename to src/masonite/providers/CorsProvider.py
diff --git a/masonite/providers/CsrfProvider.py b/src/masonite/providers/CsrfProvider.py
similarity index 100%
rename from masonite/providers/CsrfProvider.py
rename to src/masonite/providers/CsrfProvider.py
diff --git a/masonite/providers/HelpersProvider.py b/src/masonite/providers/HelpersProvider.py
similarity index 100%
rename from masonite/providers/HelpersProvider.py
rename to src/masonite/providers/HelpersProvider.py
diff --git a/masonite/providers/MailProvider.py b/src/masonite/providers/MailProvider.py
similarity index 100%
rename from masonite/providers/MailProvider.py
rename to src/masonite/providers/MailProvider.py
diff --git a/masonite/providers/QueueProvider.py b/src/masonite/providers/QueueProvider.py
similarity index 100%
rename from masonite/providers/QueueProvider.py
rename to src/masonite/providers/QueueProvider.py
diff --git a/masonite/providers/RouteProvider.py b/src/masonite/providers/RouteProvider.py
similarity index 100%
rename from masonite/providers/RouteProvider.py
rename to src/masonite/providers/RouteProvider.py
diff --git a/masonite/providers/SassProvider.py b/src/masonite/providers/SassProvider.py
similarity index 100%
rename from masonite/providers/SassProvider.py
rename to src/masonite/providers/SassProvider.py
diff --git a/masonite/providers/SessionProvider.py b/src/masonite/providers/SessionProvider.py
similarity index 100%
rename from masonite/providers/SessionProvider.py
rename to src/masonite/providers/SessionProvider.py
diff --git a/masonite/providers/StatusCodeProvider.py b/src/masonite/providers/StatusCodeProvider.py
similarity index 100%
rename from masonite/providers/StatusCodeProvider.py
rename to src/masonite/providers/StatusCodeProvider.py
diff --git a/masonite/providers/UploadProvider.py b/src/masonite/providers/UploadProvider.py
similarity index 100%
rename from masonite/providers/UploadProvider.py
rename to src/masonite/providers/UploadProvider.py
diff --git a/masonite/providers/ViewProvider.py b/src/masonite/providers/ViewProvider.py
similarity index 100%
rename from masonite/providers/ViewProvider.py
rename to src/masonite/providers/ViewProvider.py
diff --git a/masonite/providers/WhitenoiseProvider.py b/src/masonite/providers/WhitenoiseProvider.py
similarity index 100%
rename from masonite/providers/WhitenoiseProvider.py
rename to src/masonite/providers/WhitenoiseProvider.py
diff --git a/masonite/providers/__init__.py b/src/masonite/providers/__init__.py
similarity index 100%
rename from masonite/providers/__init__.py
rename to src/masonite/providers/__init__.py
diff --git a/masonite/queues/Queueable.py b/src/masonite/queues/Queueable.py
similarity index 100%
rename from masonite/queues/Queueable.py
rename to src/masonite/queues/Queueable.py
diff --git a/masonite/queues/ShouldQueue.py b/src/masonite/queues/ShouldQueue.py
similarity index 100%
rename from masonite/queues/ShouldQueue.py
rename to src/masonite/queues/ShouldQueue.py
diff --git a/masonite/queues/__init__.py b/src/masonite/queues/__init__.py
similarity index 100%
rename from masonite/queues/__init__.py
rename to src/masonite/queues/__init__.py
diff --git a/masonite/request.py b/src/masonite/request.py
similarity index 100%
rename from masonite/request.py
rename to src/masonite/request.py
diff --git a/masonite/response.py b/src/masonite/response.py
similarity index 100%
rename from masonite/response.py
rename to src/masonite/response.py
diff --git a/masonite/routes.py b/src/masonite/routes.py
similarity index 100%
rename from masonite/routes.py
rename to src/masonite/routes.py
diff --git a/masonite/snippets/__init__.py b/src/masonite/snippets/__init__.py
similarity index 100%
rename from masonite/snippets/__init__.py
rename to src/masonite/snippets/__init__.py
diff --git a/masonite/snippets/auth/controllers/ConfirmController.py b/src/masonite/snippets/auth/controllers/ConfirmController.py
similarity index 100%
rename from masonite/snippets/auth/controllers/ConfirmController.py
rename to src/masonite/snippets/auth/controllers/ConfirmController.py
diff --git a/masonite/snippets/auth/controllers/HomeController.py b/src/masonite/snippets/auth/controllers/HomeController.py
similarity index 100%
rename from masonite/snippets/auth/controllers/HomeController.py
rename to src/masonite/snippets/auth/controllers/HomeController.py
diff --git a/masonite/snippets/auth/controllers/LoginController.py b/src/masonite/snippets/auth/controllers/LoginController.py
similarity index 100%
rename from masonite/snippets/auth/controllers/LoginController.py
rename to src/masonite/snippets/auth/controllers/LoginController.py
diff --git a/masonite/snippets/auth/controllers/PasswordController.py b/src/masonite/snippets/auth/controllers/PasswordController.py
similarity index 100%
rename from masonite/snippets/auth/controllers/PasswordController.py
rename to src/masonite/snippets/auth/controllers/PasswordController.py
diff --git a/masonite/snippets/auth/controllers/RegisterController.py b/src/masonite/snippets/auth/controllers/RegisterController.py
similarity index 100%
rename from masonite/snippets/auth/controllers/RegisterController.py
rename to src/masonite/snippets/auth/controllers/RegisterController.py
diff --git a/masonite/snippets/auth/templates/auth/base.html b/src/masonite/snippets/auth/templates/auth/base.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/base.html
rename to src/masonite/snippets/auth/templates/auth/base.html
diff --git a/masonite/snippets/auth/templates/auth/confirm.html b/src/masonite/snippets/auth/templates/auth/confirm.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/confirm.html
rename to src/masonite/snippets/auth/templates/auth/confirm.html
diff --git a/masonite/snippets/auth/templates/auth/error.html b/src/masonite/snippets/auth/templates/auth/error.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/error.html
rename to src/masonite/snippets/auth/templates/auth/error.html
diff --git a/masonite/snippets/auth/templates/auth/forget.html b/src/masonite/snippets/auth/templates/auth/forget.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/forget.html
rename to src/masonite/snippets/auth/templates/auth/forget.html
diff --git a/masonite/snippets/auth/templates/auth/home.html b/src/masonite/snippets/auth/templates/auth/home.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/home.html
rename to src/masonite/snippets/auth/templates/auth/home.html
diff --git a/masonite/snippets/auth/templates/auth/login.html b/src/masonite/snippets/auth/templates/auth/login.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/login.html
rename to src/masonite/snippets/auth/templates/auth/login.html
diff --git a/masonite/snippets/auth/templates/auth/register.html b/src/masonite/snippets/auth/templates/auth/register.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/register.html
rename to src/masonite/snippets/auth/templates/auth/register.html
diff --git a/masonite/snippets/auth/templates/auth/reset.html b/src/masonite/snippets/auth/templates/auth/reset.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/reset.html
rename to src/masonite/snippets/auth/templates/auth/reset.html
diff --git a/masonite/snippets/auth/templates/auth/verify.html b/src/masonite/snippets/auth/templates/auth/verify.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/verify.html
rename to src/masonite/snippets/auth/templates/auth/verify.html
diff --git a/masonite/snippets/auth/templates/auth/verifymail.html b/src/masonite/snippets/auth/templates/auth/verifymail.html
similarity index 100%
rename from masonite/snippets/auth/templates/auth/verifymail.html
rename to src/masonite/snippets/auth/templates/auth/verifymail.html
diff --git a/masonite/snippets/exception.html b/src/masonite/snippets/exception.html
similarity index 100%
rename from masonite/snippets/exception.html
rename to src/masonite/snippets/exception.html
diff --git a/masonite/snippets/exceptions/__init__.py b/src/masonite/snippets/exceptions/__init__.py
similarity index 100%
rename from masonite/snippets/exceptions/__init__.py
rename to src/masonite/snippets/exceptions/__init__.py
diff --git a/masonite/snippets/exceptions/css/go-icon.png b/src/masonite/snippets/exceptions/css/go-icon.png
similarity index 100%
rename from masonite/snippets/exceptions/css/go-icon.png
rename to src/masonite/snippets/exceptions/css/go-icon.png
diff --git a/masonite/snippets/exceptions/css/so-icon.png b/src/masonite/snippets/exceptions/css/so-icon.png
similarity index 100%
rename from masonite/snippets/exceptions/css/so-icon.png
rename to src/masonite/snippets/exceptions/css/so-icon.png
diff --git a/masonite/snippets/exceptions/css/style.css b/src/masonite/snippets/exceptions/css/style.css
similarity index 100%
rename from masonite/snippets/exceptions/css/style.css
rename to src/masonite/snippets/exceptions/css/style.css
diff --git a/masonite/snippets/exceptions/dump.html b/src/masonite/snippets/exceptions/dump.html
similarity index 100%
rename from masonite/snippets/exceptions/dump.html
rename to src/masonite/snippets/exceptions/dump.html
diff --git a/masonite/snippets/exceptions/obj_loop.html b/src/masonite/snippets/exceptions/obj_loop.html
similarity index 100%
rename from masonite/snippets/exceptions/obj_loop.html
rename to src/masonite/snippets/exceptions/obj_loop.html
diff --git a/masonite/snippets/migrations/create_failed_jobs_table.py b/src/masonite/snippets/migrations/create_failed_jobs_table.py
similarity index 100%
rename from masonite/snippets/migrations/create_failed_jobs_table.py
rename to src/masonite/snippets/migrations/create_failed_jobs_table.py
diff --git a/masonite/snippets/scaffold/command.html b/src/masonite/snippets/scaffold/command.html
similarity index 100%
rename from masonite/snippets/scaffold/command.html
rename to src/masonite/snippets/scaffold/command.html
diff --git a/masonite/snippets/scaffold/controller.html b/src/masonite/snippets/scaffold/controller.html
similarity index 100%
rename from masonite/snippets/scaffold/controller.html
rename to src/masonite/snippets/scaffold/controller.html
diff --git a/masonite/snippets/scaffold/controller_resource.html b/src/masonite/snippets/scaffold/controller_resource.html
similarity index 100%
rename from masonite/snippets/scaffold/controller_resource.html
rename to src/masonite/snippets/scaffold/controller_resource.html
diff --git a/masonite/snippets/scaffold/job.html b/src/masonite/snippets/scaffold/job.html
similarity index 100%
rename from masonite/snippets/scaffold/job.html
rename to src/masonite/snippets/scaffold/job.html
diff --git a/masonite/snippets/scaffold/middleware.html b/src/masonite/snippets/scaffold/middleware.html
similarity index 100%
rename from masonite/snippets/scaffold/middleware.html
rename to src/masonite/snippets/scaffold/middleware.html
diff --git a/masonite/snippets/scaffold/model.html b/src/masonite/snippets/scaffold/model.html
similarity index 100%
rename from masonite/snippets/scaffold/model.html
rename to src/masonite/snippets/scaffold/model.html
diff --git a/masonite/snippets/scaffold/provider.html b/src/masonite/snippets/scaffold/provider.html
similarity index 100%
rename from masonite/snippets/scaffold/provider.html
rename to src/masonite/snippets/scaffold/provider.html
diff --git a/masonite/snippets/scaffold/test.html b/src/masonite/snippets/scaffold/test.html
similarity index 100%
rename from masonite/snippets/scaffold/test.html
rename to src/masonite/snippets/scaffold/test.html
diff --git a/masonite/snippets/scaffold/validator.html b/src/masonite/snippets/scaffold/validator.html
similarity index 100%
rename from masonite/snippets/scaffold/validator.html
rename to src/masonite/snippets/scaffold/validator.html
diff --git a/masonite/snippets/scaffold/view.html b/src/masonite/snippets/scaffold/view.html
similarity index 100%
rename from masonite/snippets/scaffold/view.html
rename to src/masonite/snippets/scaffold/view.html
diff --git a/masonite/snippets/statuscode.html b/src/masonite/snippets/statuscode.html
similarity index 100%
rename from masonite/snippets/statuscode.html
rename to src/masonite/snippets/statuscode.html
diff --git a/masonite/storage.py b/src/masonite/storage.py
similarity index 100%
rename from masonite/storage.py
rename to src/masonite/storage.py
diff --git a/masonite/testing/BaseRequest.py b/src/masonite/testing/BaseRequest.py
similarity index 100%
rename from masonite/testing/BaseRequest.py
rename to src/masonite/testing/BaseRequest.py
diff --git a/masonite/testing/MockController.py b/src/masonite/testing/MockController.py
similarity index 100%
rename from masonite/testing/MockController.py
rename to src/masonite/testing/MockController.py
diff --git a/masonite/testing/MockJson.py b/src/masonite/testing/MockJson.py
similarity index 100%
rename from masonite/testing/MockJson.py
rename to src/masonite/testing/MockJson.py
diff --git a/masonite/testing/MockRequest.py b/src/masonite/testing/MockRequest.py
similarity index 100%
rename from masonite/testing/MockRequest.py
rename to src/masonite/testing/MockRequest.py
diff --git a/masonite/testing/MockRoute.py b/src/masonite/testing/MockRoute.py
similarity index 100%
rename from masonite/testing/MockRoute.py
rename to src/masonite/testing/MockRoute.py
diff --git a/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
similarity index 100%
rename from masonite/testing/TestCase.py
rename to src/masonite/testing/TestCase.py
diff --git a/masonite/testing/__init__.py b/src/masonite/testing/__init__.py
similarity index 100%
rename from masonite/testing/__init__.py
rename to src/masonite/testing/__init__.py
diff --git a/masonite/testsuite/TestRequest.py b/src/masonite/testsuite/TestRequest.py
similarity index 100%
rename from masonite/testsuite/TestRequest.py
rename to src/masonite/testsuite/TestRequest.py
diff --git a/masonite/testsuite/TestRoute.py b/src/masonite/testsuite/TestRoute.py
similarity index 100%
rename from masonite/testsuite/TestRoute.py
rename to src/masonite/testsuite/TestRoute.py
diff --git a/masonite/testsuite/TestSuite.py b/src/masonite/testsuite/TestSuite.py
similarity index 100%
rename from masonite/testsuite/TestSuite.py
rename to src/masonite/testsuite/TestSuite.py
diff --git a/masonite/testsuite/__init__.py b/src/masonite/testsuite/__init__.py
similarity index 100%
rename from masonite/testsuite/__init__.py
rename to src/masonite/testsuite/__init__.py
diff --git a/masonite/view.py b/src/masonite/view.py
similarity index 100%
rename from masonite/view.py
rename to src/masonite/view.py
diff --git a/storage/compiled/style.css b/storage/compiled/style.css
deleted file mode 100644
index 831a52d9b..000000000
--- a/storage/compiled/style.css
+++ /dev/null
@@ -1,41 +0,0 @@
-html, body {
-  background-color: #fff;
-  color: #636b6f;
-  font-family: "Raleway", sans-serif;
-  font-weight: 100;
-  height: 100vh;
-  margin: 0; }
-
-.full-height {
-  height: 100vh; }
-
-.flex-center {
-  align-items: center;
-  display: flex;
-  justify-content: center; }
-
-.position-ref {
-  position: relative; }
-
-.top-right {
-  position: absolute;
-  right: 10px;
-  top: 18px; }
-
-.content {
-  text-align: center; }
-
-.title {
-  font-size: 84px; }
-
-.links > a {
-  color: #636b6f;
-  padding: 0 25px;
-  font-size: 12px;
-  font-weight: 600;
-  letter-spacing: .1rem;
-  text-decoration: none;
-  text-transform: uppercase; }
-
-.m-b-md {
-  margin-bottom: 30px; }
diff --git a/tests/core/test_compile_sass.py b/tests/core/test_compile_sass.py
index 6e780f25a..d5c59beac 100644
--- a/tests/core/test_compile_sass.py
+++ b/tests/core/test_compile_sass.py
@@ -1,5 +1,5 @@
 import os
-from masonite.storage import Storage
+from src.masonite.storage import Storage
 import unittest
 
 

From 26690ffa1edec080b697102496b0b3ce184e283d Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 20:49:55 -0400
Subject: [PATCH 22/59] more refactoring

---
 routes/web.py                                 |  2 +-
 src/masonite/helpers/routes.py                |  2 +-
 src/masonite/response.py                      |  6 ++---
 src/masonite/routes.py                        |  6 ++---
 src/masonite/testing/TestCase.py              | 12 +++++-----
 src/masonite/view.py                          |  4 ++--
 tests/broadcasts/test_sockets.py              |  6 ++---
 tests/core/test_app.py                        |  6 ++---
 tests/core/test_auth.py                       | 22 +++++++++----------
 tests/core/test_autoload.py                   |  8 +++----
 tests/core/test_cache.py                      |  8 +++----
 tests/core/test_container.py                  | 10 ++++-----
 tests/core/test_controllers.py                |  6 ++---
 tests/core/test_cookie_signing.py             |  4 ++--
 tests/core/test_csrf.py                       |  6 ++---
 tests/core/test_environment.py                |  4 ++--
 tests/core/test_exception.py                  | 14 ++++++------
 tests/core/test_extends.py                    |  8 +++----
 tests/core/test_hook.py                       |  4 ++--
 tests/core/test_mail_log_drivers.py           | 10 ++++-----
 tests/core/test_mailgun_driver.py             | 14 ++++++------
 tests/core/test_managers_mail_manager.py      | 20 ++++++++---------
 tests/core/test_middleware.py                 |  6 ++---
 tests/core/test_package.py                    |  2 +-
 tests/core/test_providers.py                  |  8 +++----
 tests/core/test_request_routes.py             |  6 ++---
 tests/core/test_requests.py                   | 18 +++++++--------
 tests/core/test_responsable.py                |  2 +-
 tests/core/test_response.py                   | 10 ++++-----
 tests/core/test_routes.py                     | 16 +++++++-------
 tests/core/test_service_provider.py           |  8 +++----
 tests/core/test_session.py                    | 10 ++++-----
 tests/core/test_signing.py                    |  4 ++--
 tests/core/test_testsuite.py                  |  2 +-
 tests/core/test_upload_manager.py             | 12 +++++-----
 tests/core/test_view.py                       | 10 ++++-----
 tests/database/test_user.py                   |  2 +-
 tests/helpers/test_clean_request_input.py     |  2 +-
 tests/helpers/test_collect.py                 |  2 +-
 tests/helpers/test_compact.py                 |  6 ++---
 tests/helpers/test_config.py                  |  2 +-
 tests/helpers/test_dot_notation.py            |  2 +-
 tests/helpers/test_filesystem.py              |  2 +-
 tests/helpers/test_instead_of.py              |  2 +-
 tests/helpers/test_optional.py                |  2 +-
 tests/helpers/test_password.py                |  2 +-
 tests/helpers/test_view_helpers.py            | 10 ++++-----
 tests/middleware/test_cors_middleware.py      |  6 ++---
 tests/middleware/test_csrf_middleware.py      | 16 +++++++-------
 .../test_maintenance_mode_middleware.py       |  8 +++----
 .../test_secure_headers_middleware.py         |  6 ++---
 tests/providers/test_route_provider.py        |  6 ++---
 tests/providers/test_statuscode_provider.py   | 14 ++++++------
 tests/queues/test_drivers.py                  | 14 ++++++------
 tests/storage/test_storage_manager.py         |  6 ++---
 tests/testing/test_database_tests.py          |  4 ++--
 tests/testing/test_route_tests.py             |  4 ++--
 57 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/routes/web.py b/routes/web.py
index 332340961..8df60d059 100644
--- a/routes/web.py
+++ b/routes/web.py
@@ -1,6 +1,6 @@
 """Web Routes."""
 
-from masonite.routes import Get, Post, Redirect, RouteGroup, Patch, Options
+from src.masonite.routes import Get, Post, Redirect, RouteGroup, Patch, Options
 
 
 ROUTES = [
diff --git a/src/masonite/helpers/routes.py b/src/masonite/helpers/routes.py
index b1ad10f4d..1a75967ad 100644
--- a/src/masonite/helpers/routes.py
+++ b/src/masonite/helpers/routes.py
@@ -1,6 +1,6 @@
 """Helper Functions for RouteProvider."""
 
-from masonite.helpers import deprecated
+from .misc import deprecated
 
 
 def flatten_routes(routes):
diff --git a/src/masonite/response.py b/src/masonite/response.py
index 86e6023b4..7276954f6 100644
--- a/src/masonite/response.py
+++ b/src/masonite/response.py
@@ -2,12 +2,12 @@
 
 import json
 
-from masonite.exceptions import ResponseError
-from masonite.helpers.Extendable import Extendable
+from .exceptions import ResponseError
+from .helpers.Extendable import Extendable
 
 from orator.support.collection import Collection
 from orator import Model
-from masonite.app import App
+from .app import App
 
 
 class Response(Extendable):
diff --git a/src/masonite/routes.py b/src/masonite/routes.py
index c1cec94cc..ffc9c2a1e 100644
--- a/src/masonite/routes.py
+++ b/src/masonite/routes.py
@@ -5,8 +5,8 @@
 import json
 import re
 
-from masonite.exceptions import RouteMiddlewareNotFound, InvalidRouteCompileException, RouteException
-from masonite.view import View
+from .exceptions import RouteMiddlewareNotFound, InvalidRouteCompileException, RouteException
+from .view import View
 
 
 class Route:
@@ -554,7 +554,7 @@ def __new__(cls, routes=[], middleware=[], domain=[], prefix='', name='', add_me
         Returns:
             list -- Returns a list of routes.
         """
-        from masonite.helpers.routes import flatten_routes
+        from .helpers.routes import flatten_routes
         cls.routes = flatten_routes(routes)
 
         if middleware:
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index 98ae19436..11139be54 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -5,13 +5,13 @@
 from contextlib import contextmanager
 from urllib.parse import urlencode
 
-from masonite import env
-from masonite.exceptions import RouteNotFoundException
-from masonite.helpers.migrations import Migrations
-from masonite.helpers.routes import create_matchurl, flatten_routes
-from masonite.testsuite import generate_wsgi
+from .. import env
+from ..exceptions import RouteNotFoundException
+from ..helpers.migrations import Migrations
+from ..helpers.routes import create_matchurl, flatten_routes
+from ..testsuite import generate_wsgi
 from orator.orm import Factory
-from masonite.app import App
+from ..app import App
 
 from .MockRoute import MockRoute
 
diff --git a/src/masonite/view.py b/src/masonite/view.py
index 9d6f701e3..d2ae19614 100644
--- a/src/masonite/view.py
+++ b/src/masonite/view.py
@@ -4,8 +4,8 @@
 from jinja2 import ChoiceLoader, Environment, PackageLoader, select_autoescape
 from jinja2.exceptions import TemplateNotFound
 
-from masonite.exceptions import RequiredContainerBindingNotFound, ViewException
-from masonite.response import Responsable
+from .exceptions import RequiredContainerBindingNotFound, ViewException
+from .response import Responsable
 
 class View(Responsable):
     """View class. Responsible for handling everything involved with views and view environments."""
diff --git a/tests/broadcasts/test_sockets.py b/tests/broadcasts/test_sockets.py
index 4ec985cba..3b3d38fec 100644
--- a/tests/broadcasts/test_sockets.py
+++ b/tests/broadcasts/test_sockets.py
@@ -1,8 +1,8 @@
 import os
 
-from masonite.drivers import BroadcastPusherDriver
-from masonite.managers import BroadcastManager
-from masonite.testsuite.TestSuite import TestSuite
+from src.masonite.drivers import BroadcastPusherDriver
+from src.masonite.managers import BroadcastManager
+from src.masonite.testsuite.TestSuite import TestSuite
 import unittest
 
 if os.getenv('ABLY_SECRET'):
diff --git a/tests/core/test_app.py b/tests/core/test_app.py
index 113b8857b..b473d9d3b 100644
--- a/tests/core/test_app.py
+++ b/tests/core/test_app.py
@@ -1,6 +1,6 @@
-from masonite.app import App
-from masonite.request import Request
-from masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.app import App
+from src.masonite.request import Request
+from src.masonite.testsuite.TestSuite import generate_wsgi
 import unittest
 
 REQUEST = Request({}).load_environ(generate_wsgi())
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 9052d3be7..a71edde38 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -3,18 +3,18 @@
 
 from config import application, auth
 from config.database import Model
-from masonite.app import App
-from masonite.auth import Auth, MustVerifyEmail, Sign
-from masonite.managers import AuthManager
-from masonite.drivers import AuthCookieDriver, AuthJwtDriver
-from masonite.helpers import password as bcrypt_password
-from masonite.routes import Get
-from masonite.request import Request
-from masonite.snippets.auth.controllers.ConfirmController import \
+from src.masonite.app import App
+from src.masonite.auth import Auth, MustVerifyEmail, Sign
+from src.masonite.managers import AuthManager
+from src.masonite.drivers import AuthCookieDriver, AuthJwtDriver
+from src.masonite.helpers import password as bcrypt_password
+from src.masonite.routes import Get
+from src.masonite.request import Request
+from src.masonite.snippets.auth.controllers.ConfirmController import \
     ConfirmController
-from masonite.testing import TestCase
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.view import View
+from src.masonite.testing import TestCase
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.view import View
 
 
 class User(Model, MustVerifyEmail):
diff --git a/tests/core/test_autoload.py b/tests/core/test_autoload.py
index b19e3cbe6..533cc8be3 100644
--- a/tests/core/test_autoload.py
+++ b/tests/core/test_autoload.py
@@ -1,10 +1,10 @@
 import unittest
 
-from masonite.app import App
-from masonite.autoload import Autoload
-from masonite.exceptions import (AutoloadContainerOverwrite, ContainerError,
+from src.masonite.app import App
+from src.masonite.autoload import Autoload
+from src.masonite.exceptions import (AutoloadContainerOverwrite, ContainerError,
                                  InvalidAutoloadPath)
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class TestAutoload(unittest.TestCase):
diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py
index 15ebc8b37..192eebdac 100644
--- a/tests/core/test_cache.py
+++ b/tests/core/test_cache.py
@@ -3,10 +3,10 @@
 import time
 
 from config import cache
-from masonite.app import App
-from masonite.drivers import CacheDiskDriver, CacheRedisDriver
-from masonite.environment import LoadEnvironment
-from masonite.managers import CacheManager
+from src.masonite.app import App
+from src.masonite.drivers import CacheDiskDriver, CacheRedisDriver
+from src.masonite.environment import LoadEnvironment
+from src.masonite.managers import CacheManager
 import unittest
 
 LoadEnvironment()
diff --git a/tests/core/test_container.py b/tests/core/test_container.py
index d629c6cab..12b90093f 100644
--- a/tests/core/test_container.py
+++ b/tests/core/test_container.py
@@ -1,8 +1,8 @@
-from masonite.app import App
-from masonite.request import Request
-from masonite.drivers import UploadDiskDriver
-from masonite.contracts import UploadContract
-from masonite.exceptions import ContainerError, StrictContainerException
+from src.masonite.app import App
+from src.masonite.request import Request
+from src.masonite.drivers import UploadDiskDriver
+from src.masonite.contracts import UploadContract
+from src.masonite.exceptions import ContainerError, StrictContainerException
 
 import unittest
 
diff --git a/tests/core/test_controllers.py b/tests/core/test_controllers.py
index 94ed12b1b..9ab5b093f 100644
--- a/tests/core/test_controllers.py
+++ b/tests/core/test_controllers.py
@@ -1,7 +1,7 @@
-from masonite.app import App
-from masonite.helpers.routes import get
+from src.masonite.app import App
+from src.masonite.helpers.routes import get
 from app.http.controllers.ControllerTest import ControllerTest
-from masonite.request import Request
+from src.masonite.request import Request
 import unittest
 
 
diff --git a/tests/core/test_cookie_signing.py b/tests/core/test_cookie_signing.py
index 24310e5e6..b5db056f8 100644
--- a/tests/core/test_cookie_signing.py
+++ b/tests/core/test_cookie_signing.py
@@ -1,5 +1,5 @@
-from masonite.request import Request
-from masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.request import Request
+from src.masonite.testsuite.TestSuite import generate_wsgi
 import unittest
 
 
diff --git a/tests/core/test_csrf.py b/tests/core/test_csrf.py
index 186bd769b..bd7663279 100644
--- a/tests/core/test_csrf.py
+++ b/tests/core/test_csrf.py
@@ -1,6 +1,6 @@
-from masonite.middleware import CsrfMiddleware
-from masonite.testing import TestCase
-from masonite.routes import Get, Post
+from src.masonite.middleware import CsrfMiddleware
+from src.masonite.testing import TestCase
+from src.masonite.routes import Get, Post
 
 
 class TestCsrf(TestCase):
diff --git a/tests/core/test_environment.py b/tests/core/test_environment.py
index 225da41ca..befe95b94 100644
--- a/tests/core/test_environment.py
+++ b/tests/core/test_environment.py
@@ -1,6 +1,6 @@
 
-from masonite.environment import LoadEnvironment
-from masonite import env
+from src.masonite.environment import LoadEnvironment
+from src.masonite import env
 
 import os
 import unittest
diff --git a/tests/core/test_exception.py b/tests/core/test_exception.py
index 86051884f..6412c5170 100644
--- a/tests/core/test_exception.py
+++ b/tests/core/test_exception.py
@@ -1,10 +1,10 @@
-from masonite.app import App
-from masonite.exception_handler import ExceptionHandler
-from masonite.hook import Hook
-from masonite.request import Request
-from masonite.response import Response
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.view import View
+from src.masonite.app import App
+from src.masonite.exception_handler import ExceptionHandler
+from src.masonite.hook import Hook
+from src.masonite.request import Request
+from src.masonite.response import Response
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.view import View
 import unittest
 
 
diff --git a/tests/core/test_extends.py b/tests/core/test_extends.py
index f15e1dbb2..04484044e 100644
--- a/tests/core/test_extends.py
+++ b/tests/core/test_extends.py
@@ -1,7 +1,7 @@
-from masonite.app import App
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.routes import Route
-from masonite.request import Request
+from src.masonite.app import App
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.routes import Route
+from src.masonite.request import Request
 
 wsgi_request = generate_wsgi()
 import unittest
diff --git a/tests/core/test_hook.py b/tests/core/test_hook.py
index 5d57d78cc..0c7b46e60 100644
--- a/tests/core/test_hook.py
+++ b/tests/core/test_hook.py
@@ -1,5 +1,5 @@
-from masonite.app import App
-from masonite.hook import Hook
+from src.masonite.app import App
+from src.masonite.hook import Hook
 import unittest
 
 
diff --git a/tests/core/test_mail_log_drivers.py b/tests/core/test_mail_log_drivers.py
index 30ea41282..cb36a4891 100644
--- a/tests/core/test_mail_log_drivers.py
+++ b/tests/core/test_mail_log_drivers.py
@@ -2,11 +2,11 @@
 
 import os
 
-from masonite.app import App
-from masonite.view import View
-from masonite.managers.MailManager import MailManager
-from masonite.drivers import MailLogDriver
-from masonite.drivers import MailTerminalDriver
+from src.masonite.app import App
+from src.masonite.view import View
+from src.masonite.managers.MailManager import MailManager
+from src.masonite.drivers import MailLogDriver
+from src.masonite.drivers import MailTerminalDriver
 import unittest
 import sys
 from contextlib import contextmanager
diff --git a/tests/core/test_mailgun_driver.py b/tests/core/test_mailgun_driver.py
index 11b4feec7..5881f955d 100644
--- a/tests/core/test_mailgun_driver.py
+++ b/tests/core/test_mailgun_driver.py
@@ -1,13 +1,13 @@
 import os
 
 from config import mail
-from masonite import env
-from masonite.app import App
-from masonite.drivers import MailMailgunDriver as Mailgun
-from masonite.drivers import MailSmtpDriver as MailDriver
-from masonite.environment import LoadEnvironment
-from masonite.managers.MailManager import MailManager
-from masonite.view import View
+from src.masonite import env
+from src.masonite.app import App
+from src.masonite.drivers import MailMailgunDriver as Mailgun
+from src.masonite.drivers import MailSmtpDriver as MailDriver
+from src.masonite.environment import LoadEnvironment
+from src.masonite.managers.MailManager import MailManager
+from src.masonite.view import View
 import unittest
 
 LoadEnvironment()
diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py
index f74884c59..151d64954 100644
--- a/tests/core/test_managers_mail_manager.py
+++ b/tests/core/test_managers_mail_manager.py
@@ -1,17 +1,17 @@
-from masonite.environment import LoadEnvironment
+from src.masonite.environment import LoadEnvironment
 
 LoadEnvironment()
 
 from config import mail
-from masonite.app import App
-from masonite.contracts import MailManagerContract
-from masonite.drivers import MailMailgunDriver as Mailgun
-from masonite.drivers import MailSmtpDriver as MailDriver
-from masonite.exceptions import DriverNotFound
-from masonite.managers import MailManager
-from masonite.view import View
-from masonite.contracts import MailContract
-from masonite import env
+from src.masonite.app import App
+from src.masonite.contracts import MailManagerContract
+from src.masonite.drivers import MailMailgunDriver as Mailgun
+from src.masonite.drivers import MailSmtpDriver as MailDriver
+from src.masonite.exceptions import DriverNotFound
+from src.masonite.managers import MailManager
+from src.masonite.view import View
+from src.masonite.contracts import MailContract
+from src.masonite import env
 import unittest
 
 
diff --git a/tests/core/test_middleware.py b/tests/core/test_middleware.py
index 39395e8bf..f2aa82dda 100644
--- a/tests/core/test_middleware.py
+++ b/tests/core/test_middleware.py
@@ -1,8 +1,8 @@
-from masonite.request import Request
-from masonite.routes import Get
+from src.masonite.request import Request
+from src.masonite.routes import Get
 from app.http.middleware.TestMiddleware import TestMiddleware as MiddlewareTest
 from app.http.middleware.TestHttpMiddleware import TestHttpMiddleware as MiddlewareHttpTest
-from masonite.testing import TestCase
+from src.masonite.testing import TestCase
 
 
 class MiddlewareValueTest:
diff --git a/tests/core/test_package.py b/tests/core/test_package.py
index 67a56aba3..247be2530 100644
--- a/tests/core/test_package.py
+++ b/tests/core/test_package.py
@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from masonite.packages import (create_controller, create_or_append_config)
+from src.masonite.packages import (create_controller, create_or_append_config)
 
 PACKAGE_DIRECTORY = os.getcwd()
 
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index 5f4722cb6..3ae460fae 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -1,10 +1,10 @@
 from config import application, providers
 
-from masonite.app import App
-from masonite.routes import Get
-from masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.app import App
+from src.masonite.routes import Get
+from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
 import unittest
-from masonite.helpers import config
+from src.masonite.helpers import config
 
 
 class TestProviders(unittest.TestCase):
diff --git a/tests/core/test_request_routes.py b/tests/core/test_request_routes.py
index 5287b8978..48979af13 100644
--- a/tests/core/test_request_routes.py
+++ b/tests/core/test_request_routes.py
@@ -1,6 +1,6 @@
-from masonite.routes import Get, Post
-from masonite.request import Request
-from masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.routes import Get, Post
+from src.masonite.request import Request
+from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
 import unittest
 
 
diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py
index 55eed4c13..b436bbaf5 100644
--- a/tests/core/test_requests.py
+++ b/tests/core/test_requests.py
@@ -2,15 +2,15 @@
 from cgi import MiniFieldStorage
 
 import pytest
-from masonite.app import App
-from masonite.exceptions import InvalidHTTPStatusCode, RouteException
-from masonite.helpers.routes import flatten_routes
-from masonite.helpers.time import cookie_expire_time
-from masonite.request import Request
-from masonite.response import Response
-from masonite.routes import Get, RouteGroup
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.helpers import config
+from src.masonite.app import App
+from src.masonite.exceptions import InvalidHTTPStatusCode, RouteException
+from src.masonite.helpers.routes import flatten_routes
+from src.masonite.helpers.time import cookie_expire_time
+from src.masonite.request import Request
+from src.masonite.response import Response
+from src.masonite.routes import Get, RouteGroup
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.helpers import config
 from app.http.test_controllers.TestController import TestController
 from config import application, providers
 
diff --git a/tests/core/test_responsable.py b/tests/core/test_responsable.py
index d24159f2a..ac4cd6741 100644
--- a/tests/core/test_responsable.py
+++ b/tests/core/test_responsable.py
@@ -1,4 +1,4 @@
-from masonite.testing import TestCase
+from src.masonite.testing import TestCase
 
 
 class TestResponsable(TestCase):
diff --git a/tests/core/test_response.py b/tests/core/test_response.py
index 4c0131e05..4016c0a92 100644
--- a/tests/core/test_response.py
+++ b/tests/core/test_response.py
@@ -5,11 +5,11 @@
 
 from app.http.controllers.TestController import \
     TestController as ControllerTest
-from masonite.app import App
-from masonite.request import Request
-from masonite.response import Response
-from masonite.testsuite import generate_wsgi
-from masonite.view import View
+from src.masonite.app import App
+from src.masonite.request import Request
+from src.masonite.response import Response
+from src.masonite.testsuite import generate_wsgi
+from src.masonite.view import View
 
 
 class MockUser(Model):
diff --git a/tests/core/test_routes.py b/tests/core/test_routes.py
index edde9d554..f13b330a7 100644
--- a/tests/core/test_routes.py
+++ b/tests/core/test_routes.py
@@ -1,11 +1,11 @@
-from masonite.routes import Route
-from masonite.request import Request
-from masonite.app import App
-from masonite.routes import Get, Head, Post, Match, Put, Patch, Delete, Connect, Options, Trace, RouteGroup, Redirect
-from masonite.helpers.routes import group, flatten_routes
-from masonite.helpers.routes import create_matchurl
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.exceptions import InvalidRouteCompileException, RouteException
+from src.masonite.routes import Route
+from src.masonite.request import Request
+from src.masonite.app import App
+from src.masonite.routes import Get, Head, Post, Match, Put, Patch, Delete, Connect, Options, Trace, RouteGroup, Redirect
+from src.masonite.helpers.routes import group, flatten_routes
+from src.masonite.helpers.routes import create_matchurl
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.exceptions import InvalidRouteCompileException, RouteException
 from app.http.controllers.subdirectory.SubController import SubController
 import unittest
 
diff --git a/tests/core/test_service_provider.py b/tests/core/test_service_provider.py
index 14f36d7b2..6eb99c54d 100644
--- a/tests/core/test_service_provider.py
+++ b/tests/core/test_service_provider.py
@@ -1,10 +1,10 @@
 import os
 import unittest
 
-from masonite.provider import ServiceProvider
-from masonite.request import Request
-from masonite.routes import Get
-from masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.provider import ServiceProvider
+from src.masonite.request import Request
+from src.masonite.routes import Get
+from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
 
 
 class ContainerTest(ServiceProvider):
diff --git a/tests/core/test_session.py b/tests/core/test_session.py
index 2f346b632..d928686d0 100644
--- a/tests/core/test_session.py
+++ b/tests/core/test_session.py
@@ -1,9 +1,9 @@
 from config import session
-from masonite.app import App
-from masonite.drivers import SessionCookieDriver, SessionMemoryDriver
-from masonite.managers import SessionManager
-from masonite.request import Request
-from masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.app import App
+from src.masonite.drivers import SessionCookieDriver, SessionMemoryDriver
+from src.masonite.managers import SessionManager
+from src.masonite.request import Request
+from src.masonite.testsuite.TestSuite import generate_wsgi
 import unittest
 
 
diff --git a/tests/core/test_signing.py b/tests/core/test_signing.py
index 772a1ebf5..197e67e91 100644
--- a/tests/core/test_signing.py
+++ b/tests/core/test_signing.py
@@ -2,8 +2,8 @@
 
 from cryptography.fernet import Fernet
 
-from masonite.auth.Sign import Sign
-from masonite.exceptions import InvalidSecretKey
+from src.masonite.auth.Sign import Sign
+from src.masonite.exceptions import InvalidSecretKey
 
 
 class TestSigning(unittest.TestCase):
diff --git a/tests/core/test_testsuite.py b/tests/core/test_testsuite.py
index 30f0f9994..04e75396d 100644
--- a/tests/core/test_testsuite.py
+++ b/tests/core/test_testsuite.py
@@ -1,4 +1,4 @@
-from masonite.testsuite.TestSuite import TestSuite
+from src.masonite.testsuite.TestSuite import TestSuite
 import unittest
 
 
diff --git a/tests/core/test_upload_manager.py b/tests/core/test_upload_manager.py
index 1e8411ccd..aaf165ed1 100644
--- a/tests/core/test_upload_manager.py
+++ b/tests/core/test_upload_manager.py
@@ -3,13 +3,13 @@
 import unittest
 
 from config import application, storage
-from masonite.app import App
-from masonite.drivers import UploadDiskDriver, UploadS3Driver
-from masonite.environment import LoadEnvironment
-from masonite.exceptions import (DriverNotFound, FileTypeException,
+from src.masonite.app import App
+from src.masonite.drivers import UploadDiskDriver, UploadS3Driver
+from src.masonite.environment import LoadEnvironment
+from src.masonite.exceptions import (DriverNotFound, FileTypeException,
                                  UnacceptableDriverType)
-from masonite.helpers import static
-from masonite.managers.UploadManager import UploadManager
+from src.masonite.helpers import static
+from src.masonite.managers.UploadManager import UploadManager
 
 LoadEnvironment()
 
diff --git a/tests/core/test_view.py b/tests/core/test_view.py
index 1e82a11e2..fbdff44f6 100644
--- a/tests/core/test_view.py
+++ b/tests/core/test_view.py
@@ -4,11 +4,11 @@
 from jinja2 import FileSystemLoader
 
 from config import cache
-from masonite.app import App
-from masonite.drivers import CacheDiskDriver
-from masonite.exceptions import RequiredContainerBindingNotFound, ViewException
-from masonite.managers.CacheManager import CacheManager
-from masonite.view import View
+from src.masonite.app import App
+from src.masonite.drivers import CacheDiskDriver
+from src.masonite.exceptions import RequiredContainerBindingNotFound, ViewException
+from src.masonite.managers.CacheManager import CacheManager
+from src.masonite.view import View
 import unittest
 
 
diff --git a/tests/database/test_user.py b/tests/database/test_user.py
index 73fcdef57..56f9d4bfc 100644
--- a/tests/database/test_user.py
+++ b/tests/database/test_user.py
@@ -1,6 +1,6 @@
 """Example Database Testcase."""
 
-from masonite.testing import TestCase
+from src.masonite.testing import TestCase
 
 from app.User import User
 from config.factories import factory
diff --git a/tests/helpers/test_clean_request_input.py b/tests/helpers/test_clean_request_input.py
index ba0127b80..11c466c8c 100644
--- a/tests/helpers/test_clean_request_input.py
+++ b/tests/helpers/test_clean_request_input.py
@@ -1,7 +1,7 @@
 import cgi
 import unittest
 
-from masonite.helpers import clean_request_input
+from src.masonite.helpers import clean_request_input
 
 
 class TestCleanRequestInput(unittest.TestCase):
diff --git a/tests/helpers/test_collect.py b/tests/helpers/test_collect.py
index 82a570f83..e8a8c7843 100644
--- a/tests/helpers/test_collect.py
+++ b/tests/helpers/test_collect.py
@@ -1,4 +1,4 @@
-from masonite.helpers import collect
+from src.masonite.helpers import collect
 
 
 class TestCollect:
diff --git a/tests/helpers/test_compact.py b/tests/helpers/test_compact.py
index 3290b147f..522d96356 100644
--- a/tests/helpers/test_compact.py
+++ b/tests/helpers/test_compact.py
@@ -1,6 +1,6 @@
-from masonite.helpers import compact
-from masonite.request import Request
-from masonite.exceptions import AmbiguousError
+from src.masonite.helpers import compact
+from src.masonite.request import Request
+from src.masonite.exceptions import AmbiguousError
 
 import unittest
 
diff --git a/tests/helpers/test_config.py b/tests/helpers/test_config.py
index 2330090b0..0dbf7f611 100644
--- a/tests/helpers/test_config.py
+++ b/tests/helpers/test_config.py
@@ -1,7 +1,7 @@
 
 import unittest
 
-from masonite.helpers import Dot, config
+from src.masonite.helpers import Dot, config
 
 from config import database
 
diff --git a/tests/helpers/test_dot_notation.py b/tests/helpers/test_dot_notation.py
index bd454f6f8..8ced9c08c 100644
--- a/tests/helpers/test_dot_notation.py
+++ b/tests/helpers/test_dot_notation.py
@@ -1,6 +1,6 @@
 import unittest
 
-from masonite.helpers import dot, Dot as DictDot
+from src.masonite.helpers import dot, Dot as DictDot
 
 
 class TestDot(unittest.TestCase):
diff --git a/tests/helpers/test_filesystem.py b/tests/helpers/test_filesystem.py
index fd27f3cdb..f42df0c72 100644
--- a/tests/helpers/test_filesystem.py
+++ b/tests/helpers/test_filesystem.py
@@ -1,6 +1,6 @@
 import shutil
 
-from masonite.helpers.filesystem import make_directory
+from src.masonite.helpers.filesystem import make_directory
 
 import unittest
 
diff --git a/tests/helpers/test_instead_of.py b/tests/helpers/test_instead_of.py
index 6a4f7f10f..3c8ede614 100644
--- a/tests/helpers/test_instead_of.py
+++ b/tests/helpers/test_instead_of.py
@@ -1,4 +1,4 @@
-from masonite.request import Request
+from src.masonite.request import Request
 import unittest
 
 
diff --git a/tests/helpers/test_optional.py b/tests/helpers/test_optional.py
index 3d3d86c70..abbf85fc4 100644
--- a/tests/helpers/test_optional.py
+++ b/tests/helpers/test_optional.py
@@ -1,4 +1,4 @@
-from masonite.helpers import optional
+from src.masonite.helpers import optional
 import unittest
 
 
diff --git a/tests/helpers/test_password.py b/tests/helpers/test_password.py
index d78223606..97188a3f0 100644
--- a/tests/helpers/test_password.py
+++ b/tests/helpers/test_password.py
@@ -1,4 +1,4 @@
-from masonite.helpers import password
+from src.masonite.helpers import password
 import unittest
 
 
diff --git a/tests/helpers/test_view_helpers.py b/tests/helpers/test_view_helpers.py
index ef7b7f9ae..f8a278397 100644
--- a/tests/helpers/test_view_helpers.py
+++ b/tests/helpers/test_view_helpers.py
@@ -1,11 +1,11 @@
 
 import unittest
 
-from masonite.app import App
-from masonite.providers import HelpersProvider
-from masonite.request import Request
-from masonite.testsuite import generate_wsgi
-from masonite.view import View
+from src.masonite.app import App
+from src.masonite.providers import HelpersProvider
+from src.masonite.request import Request
+from src.masonite.testsuite import generate_wsgi
+from src.masonite.view import View
 
 
 class TestViewHelpers(unittest.TestCase):
diff --git a/tests/middleware/test_cors_middleware.py b/tests/middleware/test_cors_middleware.py
index 6897c9a4f..53a9dabb1 100644
--- a/tests/middleware/test_cors_middleware.py
+++ b/tests/middleware/test_cors_middleware.py
@@ -1,6 +1,6 @@
-from masonite.middleware import CorsMiddleware
-from masonite.request import Request
-from masonite.testsuite import generate_wsgi, TestSuite
+from src.masonite.middleware import CorsMiddleware
+from src.masonite.request import Request
+from src.masonite.testsuite import generate_wsgi, TestSuite
 
 import unittest
 
diff --git a/tests/middleware/test_csrf_middleware.py b/tests/middleware/test_csrf_middleware.py
index dbdcb1f7f..b04ea681e 100644
--- a/tests/middleware/test_csrf_middleware.py
+++ b/tests/middleware/test_csrf_middleware.py
@@ -1,11 +1,11 @@
-from masonite.request import Request
-from masonite.view import View
-from masonite.auth.Csrf import Csrf
-from masonite.app import App
-from masonite.middleware import CsrfMiddleware
-from masonite.testsuite.TestSuite import generate_wsgi
-from masonite.exceptions import InvalidCSRFToken
-from masonite.routes import Get, Route
+from src.masonite.request import Request
+from src.masonite.view import View
+from src.masonite.auth.Csrf import Csrf
+from src.masonite.app import App
+from src.masonite.middleware import CsrfMiddleware
+from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.exceptions import InvalidCSRFToken
+from src.masonite.routes import Get, Route
 import unittest
 
 
diff --git a/tests/middleware/test_maintenance_mode_middleware.py b/tests/middleware/test_maintenance_mode_middleware.py
index a28c61d44..b05dad6d3 100644
--- a/tests/middleware/test_maintenance_mode_middleware.py
+++ b/tests/middleware/test_maintenance_mode_middleware.py
@@ -1,10 +1,10 @@
 """ Test Maintenance Mode Midddleware """
 import os
 
-from masonite.app import App
-from masonite.request import Request
-from masonite.middleware import MaintenanceModeMiddleware
-from masonite.testsuite import generate_wsgi
+from src.masonite.app import App
+from src.masonite.request import Request
+from src.masonite.middleware import MaintenanceModeMiddleware
+from src.masonite.testsuite import generate_wsgi
 
 from config import application
 import unittest
diff --git a/tests/middleware/test_secure_headers_middleware.py b/tests/middleware/test_secure_headers_middleware.py
index a2a0e3563..7780920d4 100644
--- a/tests/middleware/test_secure_headers_middleware.py
+++ b/tests/middleware/test_secure_headers_middleware.py
@@ -1,9 +1,9 @@
 """ Test Secure Headers Midddleware """
 import unittest
 
-from masonite.middleware import SecureHeadersMiddleware
-from masonite.request import Request
-from masonite.testsuite import TestSuite, generate_wsgi
+from src.masonite.middleware import SecureHeadersMiddleware
+from src.masonite.request import Request
+from src.masonite.testsuite import TestSuite, generate_wsgi
 
 
 class TestSecureHeadersMiddleware(unittest.TestCase):
diff --git a/tests/providers/test_route_provider.py b/tests/providers/test_route_provider.py
index 7d1907bb9..5310c37e9 100644
--- a/tests/providers/test_route_provider.py
+++ b/tests/providers/test_route_provider.py
@@ -1,8 +1,8 @@
 
 from app.http.controllers.ControllerTest import ControllerTest
-from masonite.routes import Get, Match
-from masonite.testing import TestCase
-from masonite.exceptions import RouteNotFoundException
+from src.masonite.routes import Get, Match
+from src.masonite.testing import TestCase
+from src.masonite.exceptions import RouteNotFoundException
 
 
 class TestRouteProvider(TestCase):
diff --git a/tests/providers/test_statuscode_provider.py b/tests/providers/test_statuscode_provider.py
index 73c846f8b..170703664 100644
--- a/tests/providers/test_statuscode_provider.py
+++ b/tests/providers/test_statuscode_provider.py
@@ -1,10 +1,10 @@
-from masonite.providers import StatusCodeProvider
-from masonite.request import Request
-from masonite.response import Response
-from masonite.view import View
-from masonite.app import App
-from masonite.providers.StatusCodeProvider import ServerErrorExceptionHook
-from masonite.testsuite import generate_wsgi
+from src.masonite.providers import StatusCodeProvider
+from src.masonite.request import Request
+from src.masonite.response import Response
+from src.masonite.view import View
+from src.masonite.app import App
+from src.masonite.providers.StatusCodeProvider import ServerErrorExceptionHook
+from src.masonite.testsuite import generate_wsgi
 import unittest
 
 
diff --git a/tests/queues/test_drivers.py b/tests/queues/test_drivers.py
index 5d4fcd11d..cc09c1f7f 100644
--- a/tests/queues/test_drivers.py
+++ b/tests/queues/test_drivers.py
@@ -1,12 +1,12 @@
 import unittest
 
-from masonite.app import App
-from masonite.drivers import QueueAmqpDriver, QueueAsyncDriver
-from masonite.environment import LoadEnvironment, env
-from masonite.exceptions import QueueException
-from masonite.managers import QueueManager
-from masonite.queues.Queueable import Queueable
-from masonite.helpers import config
+from src.masonite.app import App
+from src.masonite.drivers import QueueAmqpDriver, QueueAsyncDriver
+from src.masonite.environment import LoadEnvironment, env
+from src.masonite.exceptions import QueueException
+from src.masonite.managers import QueueManager
+from src.masonite.queues.Queueable import Queueable
+from src.masonite.helpers import config
 from config import queue
 
 LoadEnvironment()
diff --git a/tests/storage/test_storage_manager.py b/tests/storage/test_storage_manager.py
index fa3195703..b1bc89616 100644
--- a/tests/storage/test_storage_manager.py
+++ b/tests/storage/test_storage_manager.py
@@ -1,9 +1,9 @@
 import os
 import unittest
 
-from masonite.testsuite import TestSuite
-from masonite.managers import StorageManager
-from masonite.drivers import StorageDiskDriver
+from src.masonite.testsuite import TestSuite
+from src.masonite.managers import StorageManager
+from src.masonite.drivers import StorageDiskDriver
 from config import storage
 
 
diff --git a/tests/testing/test_database_tests.py b/tests/testing/test_database_tests.py
index 35914964b..caebc438d 100644
--- a/tests/testing/test_database_tests.py
+++ b/tests/testing/test_database_tests.py
@@ -1,8 +1,8 @@
 
-from masonite.testing import TestCase
+from src.masonite.testing import TestCase
 
 from config.database import Model
-from masonite import env
+from src.masonite import env
 
 
 class User(Model):
diff --git a/tests/testing/test_route_tests.py b/tests/testing/test_route_tests.py
index 5e6e63e93..e486007d6 100644
--- a/tests/testing/test_route_tests.py
+++ b/tests/testing/test_route_tests.py
@@ -1,7 +1,7 @@
 from routes import web
-from masonite.testing import TestCase
+from src.masonite.testing import TestCase
 from app.User import User
-from masonite.exceptions import InvalidCSRFToken
+from src.masonite.exceptions import InvalidCSRFToken
 
 
 class TestUnitTest(TestCase):

From 7a01afb1b37f662c9103fec1e9e4f6ec3be6fe80 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 21:45:10 -0400
Subject: [PATCH 23/59] refactored drivers

---
 src/masonite/auth/Auth.py                        |  4 ++--
 src/masonite/auth/MustVerifyEmail.py             |  2 +-
 src/masonite/auth/Sign.py                        |  2 +-
 .../drivers/authentication/AuthCookieDriver.py   |  6 +++---
 .../drivers/authentication/AuthJwtDriver.py      | 12 ++++++------
 src/masonite/drivers/mail/BaseMailDriver.py      | 10 +++++-----
 src/masonite/drivers/upload/BaseUploadDriver.py  |  8 ++++----
 src/masonite/drivers/upload/UploadDiskDriver.py  |  6 +++---
 src/masonite/drivers/upload/UploadS3Driver.py    | 12 ++++++------
 src/masonite/request.py                          | 16 ++++++++--------
 src/masonite/testing/MockJson.py                 |  4 ++--
 src/masonite/testing/MockRequest.py              |  4 ++--
 src/masonite/testing/MockRoute.py                |  6 +++---
 src/masonite/testsuite/TestRoute.py              |  2 +-
 src/masonite/testsuite/TestSuite.py              |  8 ++++----
 15 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/masonite/auth/Auth.py b/src/masonite/auth/Auth.py
index d16aa766b..09e51a8b4 100644
--- a/src/masonite/auth/Auth.py
+++ b/src/masonite/auth/Auth.py
@@ -4,8 +4,8 @@
 
 import bcrypt
 
-from masonite.helpers import password as bcrypt_password, config
-from masonite.app import App
+from ..helpers import password as bcrypt_password, config
+from ..app import App
 
 
 class Auth:
diff --git a/src/masonite/auth/MustVerifyEmail.py b/src/masonite/auth/MustVerifyEmail.py
index 3379790a6..5e56d622a 100644
--- a/src/masonite/auth/MustVerifyEmail.py
+++ b/src/masonite/auth/MustVerifyEmail.py
@@ -2,7 +2,7 @@
 
 import time
 
-from masonite.auth.Sign import Sign
+from ..auth.Sign import Sign
 
 
 class MustVerifyEmail:
diff --git a/src/masonite/auth/Sign.py b/src/masonite/auth/Sign.py
index 331a412bd..62ce69572 100644
--- a/src/masonite/auth/Sign.py
+++ b/src/masonite/auth/Sign.py
@@ -3,7 +3,7 @@
 
 from cryptography.fernet import Fernet
 
-from masonite.exceptions import InvalidSecretKey
+from ..exceptions import InvalidSecretKey
 
 
 class Sign:
diff --git a/src/masonite/drivers/authentication/AuthCookieDriver.py b/src/masonite/drivers/authentication/AuthCookieDriver.py
index d4459a170..43ffc929c 100644
--- a/src/masonite/drivers/authentication/AuthCookieDriver.py
+++ b/src/masonite/drivers/authentication/AuthCookieDriver.py
@@ -1,8 +1,8 @@
 """AuthCookieDriver Module."""
 
-from masonite.contracts import AuthContract
-from masonite.drivers import BaseDriver
-from masonite.request import Request
+from ...contracts import AuthContract
+from ...drivers import BaseDriver
+from ...request import Request
 
 
 class AuthCookieDriver(BaseDriver, AuthContract):
diff --git a/src/masonite/drivers/authentication/AuthJwtDriver.py b/src/masonite/drivers/authentication/AuthJwtDriver.py
index ccb8f3e09..c9c17423b 100644
--- a/src/masonite/drivers/authentication/AuthJwtDriver.py
+++ b/src/masonite/drivers/authentication/AuthJwtDriver.py
@@ -1,12 +1,12 @@
 """AuthJWTDriver Module."""
 
 import pendulum
-from masonite.auth import Auth
-from masonite.contracts import AuthContract
-from masonite.drivers import BaseDriver
-from masonite.exceptions import DriverLibraryNotFound
-from masonite.helpers import config, cookie_expire_time
-from masonite.request import Request
+from ...auth import Auth
+from ...contracts import AuthContract
+from ...drivers import BaseDriver
+from ...exceptions import DriverLibraryNotFound
+from ...helpers import config, cookie_expire_time
+from ...request import Request
 
 
 class AuthJwtDriver(BaseDriver, AuthContract):
diff --git a/src/masonite/drivers/mail/BaseMailDriver.py b/src/masonite/drivers/mail/BaseMailDriver.py
index 80313f311..9f8cb36cd 100644
--- a/src/masonite/drivers/mail/BaseMailDriver.py
+++ b/src/masonite/drivers/mail/BaseMailDriver.py
@@ -1,10 +1,10 @@
 """Base mail driver module."""
 
-from masonite.drivers import BaseDriver
-from masonite.view import View
-from masonite.app import App
-from masonite.helpers import config
-from masonite.response import Responsable
+from .. import BaseDriver
+from ...view import View
+from ...app import App
+from ...helpers import config
+from ...response import Responsable
 
 
 class BaseMailDriver(BaseDriver, Responsable):
diff --git a/src/masonite/drivers/upload/BaseUploadDriver.py b/src/masonite/drivers/upload/BaseUploadDriver.py
index e8f24cf81..a6ba43819 100644
--- a/src/masonite/drivers/upload/BaseUploadDriver.py
+++ b/src/masonite/drivers/upload/BaseUploadDriver.py
@@ -1,10 +1,10 @@
 """Base upload driver module."""
 
 import _io
-from masonite.drivers import BaseDriver
-from masonite.exceptions import FileTypeException
-from masonite.helpers import random_string
-from masonite.helpers import config
+from ...drivers import BaseDriver
+from ...exceptions import FileTypeException
+from ...helpers import random_string
+from ...helpers import config
 
 
 class BaseUploadDriver(BaseDriver):
diff --git a/src/masonite/drivers/upload/UploadDiskDriver.py b/src/masonite/drivers/upload/UploadDiskDriver.py
index 60ebc6717..d11235808 100644
--- a/src/masonite/drivers/upload/UploadDiskDriver.py
+++ b/src/masonite/drivers/upload/UploadDiskDriver.py
@@ -3,9 +3,9 @@
 import os
 import _io
 
-from masonite.contracts import UploadContract
-from masonite.drivers import BaseUploadDriver
-from masonite.helpers.filesystem import make_directory
+from ...contracts import UploadContract
+from ...drivers import BaseUploadDriver
+from ...helpers.filesystem import make_directory
 
 
 class UploadDiskDriver(BaseUploadDriver, UploadContract):
diff --git a/src/masonite/drivers/upload/UploadS3Driver.py b/src/masonite/drivers/upload/UploadS3Driver.py
index f87ca4994..b9ebdb13f 100644
--- a/src/masonite/drivers/upload/UploadS3Driver.py
+++ b/src/masonite/drivers/upload/UploadS3Driver.py
@@ -2,12 +2,12 @@
 
 import os
 
-from masonite.contracts import UploadContract
-from masonite.drivers import BaseUploadDriver
-from masonite.exceptions import DriverLibraryNotFound
-from masonite.managers import UploadManager
-from masonite.app import App
-from masonite.helpers import config
+from ...contracts import UploadContract
+from ...drivers import BaseUploadDriver
+from ...exceptions import DriverLibraryNotFound
+from ...managers import UploadManager
+from ...app import App
+from ...helpers import config
 
 
 class UploadS3Driver(BaseUploadDriver, UploadContract):
diff --git a/src/masonite/request.py b/src/masonite/request.py
index b031aab73..dafcd4441 100644
--- a/src/masonite/request.py
+++ b/src/masonite/request.py
@@ -15,14 +15,14 @@
 
 import tldextract
 from cryptography.fernet import InvalidToken
-from masonite.auth.Sign import Sign
-from masonite.exceptions import InvalidHTTPStatusCode, RouteException
-from masonite.helpers import Dot as DictDot
-from masonite.helpers import clean_request_input, dot
-from masonite.helpers.Extendable import Extendable
-from masonite.helpers.routes import compile_route_to_regex
-from masonite.helpers.status import response_statuses
-from masonite.helpers.time import cookie_expire_time
+from .auth.Sign import Sign
+from .exceptions import InvalidHTTPStatusCode, RouteException
+from .helpers import Dot as DictDot
+from .helpers import clean_request_input, dot
+from .helpers.Extendable import Extendable
+from .helpers.routes import compile_route_to_regex
+from .helpers.status import response_statuses
+from .helpers.time import cookie_expire_time
 
 
 class Request(Extendable):
diff --git a/src/masonite/testing/MockJson.py b/src/masonite/testing/MockJson.py
index 9ef3bc36d..74fa84d7a 100644
--- a/src/masonite/testing/MockJson.py
+++ b/src/masonite/testing/MockJson.py
@@ -1,5 +1,5 @@
-from masonite.testsuite import TestSuite, generate_wsgi
-from masonite.testing import BaseRequest
+from ..testsuite import TestSuite, generate_wsgi
+from ..testing import BaseRequest
 
 
 class MockJson(BaseRequest):
diff --git a/src/masonite/testing/MockRequest.py b/src/masonite/testing/MockRequest.py
index b56a8ca91..720c21dd4 100644
--- a/src/masonite/testing/MockRequest.py
+++ b/src/masonite/testing/MockRequest.py
@@ -1,5 +1,5 @@
-from masonite.testsuite import TestSuite
-from masonite.testing import BaseRequest
+from ..testsuite import TestSuite
+from ..testing import BaseRequest
 
 
 class MockRequest(BaseRequest):
diff --git a/src/masonite/testing/MockRoute.py b/src/masonite/testing/MockRoute.py
index ddf8a8f10..36c134a19 100644
--- a/src/masonite/testing/MockRoute.py
+++ b/src/masonite/testing/MockRoute.py
@@ -1,7 +1,7 @@
-from masonite.request import Request
-from masonite.testsuite import TestSuite, generate_wsgi
+from ..request import Request
+from ..testsuite import TestSuite, generate_wsgi
 import json
-from masonite.helpers import Dot
+from ..helpers import Dot
 
 
 class MockRoute:
diff --git a/src/masonite/testsuite/TestRoute.py b/src/masonite/testsuite/TestRoute.py
index 4915cbb47..667def4ae 100644
--- a/src/masonite/testsuite/TestRoute.py
+++ b/src/masonite/testsuite/TestRoute.py
@@ -1,4 +1,4 @@
-from masonite.routes import Get
+from ..routes import Get
 
 
 class TestRoute:
diff --git a/src/masonite/testsuite/TestSuite.py b/src/masonite/testsuite/TestSuite.py
index 29fcbfc79..108cc9da3 100644
--- a/src/masonite/testsuite/TestSuite.py
+++ b/src/masonite/testsuite/TestSuite.py
@@ -1,7 +1,7 @@
-from masonite.app import App
-from masonite.testsuite.TestRoute import TestRoute
-from masonite.testsuite.TestRequest import TestRequest
-from masonite.helpers import config
+from ..app import App
+from .TestRoute import TestRoute
+from .TestRequest import TestRequest
+from ..helpers import config
 
 import io
 

From f3609bc69301de81e8eb527d04bf0ae7adcaaf7d Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 22:19:15 -0400
Subject: [PATCH 24/59] refactored

---
 app/http/controllers/ConfirmController.py     | 71 +++++++++++++++++++
 app/http/controllers/ControllerTest.py        |  4 +-
 app/http/controllers/TestController.py        |  4 +-
 app/http/controllers/UnitTestController.py    |  4 +-
 app/http/controllers/WelcomeController.py     |  6 +-
 app/http/middleware/AddAttributeMiddleware.py |  2 +-
 .../middleware/AuthenticationMiddleware.py    |  2 +-
 app/http/middleware/CsrfMiddleware.py         |  2 +-
 app/http/middleware/LoadUserMiddleware.py     |  4 +-
 app/http/middleware/MiddlewareTest.py         |  2 +-
 app/http/middleware/TestHttpMiddleware.py     |  2 +-
 app/http/middleware/TestMiddleware.py         |  2 +-
 app/http/middleware/VerifyEmailMiddleware.py  |  2 +-
 app/jobs/TestJob.py                           |  2 +-
 config/application.py                         |  6 +-
 src/__init__.py                               |  0
 src/masonite/autoload.py                      |  2 +-
 src/masonite/commands/BaseScaffoldCommand.py  |  6 +-
 src/masonite/commands/CommandCommand.py       |  2 +-
 src/masonite/commands/ControllerCommand.py    |  6 +-
 src/masonite/commands/InfoCommand.py          |  4 +-
 src/masonite/commands/JobCommand.py           |  2 +-
 src/masonite/commands/MiddlewareCommand.py    |  2 +-
 src/masonite/commands/MigrateCommand.py       |  2 +-
 src/masonite/commands/MigrateResetCommand.py  |  2 +-
 .../commands/MigrateRollbackCommand.py        |  2 +-
 src/masonite/commands/MigrateStatusCommand.py |  2 +-
 src/masonite/commands/ModelCommand.py         |  6 +-
 src/masonite/commands/ProviderCommand.py      |  2 +-
 src/masonite/commands/PublishCommand.py       |  2 +-
 src/masonite/commands/QueueTableCommand.py    |  2 +-
 src/masonite/commands/QueueWorkCommand.py     |  2 +-
 src/masonite/commands/ServeCommand.py         |  2 +-
 src/masonite/commands/TestCommand.py          |  2 +-
 src/masonite/commands/ViewCommand.py          |  2 +-
 .../drivers/broadcast/BroadcastAblyDriver.py  |  8 +--
 .../broadcast/BroadcastPusherDriver.py        |  8 +--
 src/masonite/drivers/cache/BaseCacheDriver.py |  2 +-
 src/masonite/drivers/cache/CacheDiskDriver.py |  8 +--
 .../drivers/cache/CacheRedisDriver.py         |  6 +-
 src/masonite/drivers/mail/MailLogDriver.py    |  8 +--
 .../drivers/mail/MailMailgunDriver.py         |  6 +-
 src/masonite/drivers/mail/MailSmtpDriver.py   |  6 +-
 .../drivers/mail/MailTerminalDriver.py        |  8 +--
 src/masonite/drivers/queue/BaseQueueDriver.py |  4 +-
 src/masonite/drivers/queue/QueueAmqpDriver.py | 10 +--
 .../drivers/queue/QueueAsyncDriver.py         | 10 +--
 .../drivers/session/SessionCookieDriver.py    |  8 +--
 .../drivers/session/SessionMemoryDriver.py    |  6 +-
 .../drivers/storage/StorageDiskDriver.py      |  6 +-
 src/masonite/exception_handler.py             | 12 ++--
 src/masonite/helpers/routes.py                | 12 ++--
 src/masonite/helpers/sign.py                  |  2 +-
 src/masonite/hook.py                          |  2 +-
 src/masonite/middleware/CorsMiddleware.py     |  4 +-
 src/masonite/middleware/CsrfMiddleware.py     |  8 +--
 .../middleware/MaintenanceModeMiddleware.py   |  2 +-
 src/masonite/middleware/ResponseMiddleware.py |  6 +-
 .../middleware/SecureHeadersMiddleware.py     |  2 +-
 src/masonite/provider.py                      |  4 +-
 src/masonite/providers/AppProvider.py         | 28 ++++----
 src/masonite/providers/BroadcastProvider.py   | 10 +--
 src/masonite/providers/CacheProvider.py       | 10 +--
 src/masonite/providers/CorsProvider.py        |  8 +--
 src/masonite/providers/CsrfProvider.py        |  4 +-
 src/masonite/providers/HelpersProvider.py     | 16 ++---
 src/masonite/providers/MailProvider.py        | 10 +--
 src/masonite/providers/QueueProvider.py       | 10 +--
 src/masonite/providers/RouteProvider.py       | 10 +--
 src/masonite/providers/SassProvider.py        |  4 +-
 src/masonite/providers/SessionProvider.py     | 14 ++--
 src/masonite/providers/StatusCodeProvider.py  | 10 +--
 src/masonite/providers/UploadProvider.py      | 14 ++--
 src/masonite/providers/ViewProvider.py        |  9 ++-
 src/masonite/providers/WhitenoiseProvider.py  |  4 +-
 src/masonite/view.py                          |  1 +
 storage/compiled/style.css                    | 41 +++++++++++
 tests/core/test_auth.py                       |  2 +-
 78 files changed, 325 insertions(+), 205 deletions(-)
 create mode 100644 app/http/controllers/ConfirmController.py
 create mode 100644 src/__init__.py
 create mode 100644 storage/compiled/style.css

diff --git a/app/http/controllers/ConfirmController.py b/app/http/controllers/ConfirmController.py
new file mode 100644
index 000000000..809786fe8
--- /dev/null
+++ b/app/http/controllers/ConfirmController.py
@@ -0,0 +1,71 @@
+"""The ConfirmController Module."""
+import datetime
+
+from src.masonite.auth import Auth, MustVerifyEmail
+from src.masonite.auth.Sign import Sign
+from src.masonite.managers import MailManager
+from src.masonite.request import Request
+from src.masonite.view import View
+from src.masonite.helpers import config
+from app.User import User
+
+
+class ConfirmController:
+    """The ConfirmController class."""
+
+    def __init__(self):
+        """The ConfirmController Constructor."""
+        pass
+
+    def verify_show(self, request: Request, view: View, auth: Auth):
+        """Show the Verify Email page for unverified users.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        return view.render('auth/verify', {'app': config('application'), 'Auth': auth})
+
+    def confirm_email(self, request: Request, view: View, auth: Auth):
+        """Confirm User email and show the correct response.
+
+        Arguments:
+            request {masonite.request.request} -- The Masonite request class.
+            request {masonite.view.view} -- The Masonite view class.
+            request {masonite.auth.auth} -- The Masonite Auth class.
+
+        Returns:
+            [type] -- [description]
+        """
+        sign = Sign()
+        token = sign.unsign(request.param('id'))
+
+        if token is not None:
+            tokenParts = token.split("::")
+            if len(tokenParts) > 1:
+                user = auth.auth_model.find(tokenParts[0])
+
+                if user.verified_at is None:
+                    timestamp = datetime.datetime.fromtimestamp(float(tokenParts[1]))
+                    now = datetime.datetime.now()
+                    timestamp_plus_10 = timestamp + datetime.timedelta(minutes=10)
+
+                    if now < timestamp_plus_10:
+                        user.verified_at = datetime.datetime.now()
+                        user.save()
+
+                        return view.render('auth/confirm', {'app': config('application'), 'Auth': auth})
+
+        return view.render('auth/error', {'app': config('application'), 'Auth': auth})
+
+    def send_verify_email(self, manager: MailManager, request: Request):
+        user = request.user()
+
+        if isinstance(user, MustVerifyEmail):
+            user.verify_email(manager, request)
+
+        return request.redirect('/home')
diff --git a/app/http/controllers/ControllerTest.py b/app/http/controllers/ControllerTest.py
index 660887315..b1176f7d3 100644
--- a/app/http/controllers/ControllerTest.py
+++ b/app/http/controllers/ControllerTest.py
@@ -1,5 +1,5 @@
-from masonite.request import Request
-from masonite.view import View
+from src.masonite.request import Request
+from src.masonite.view import View
 
 
 class ControllerTest:
diff --git a/app/http/controllers/TestController.py b/app/http/controllers/TestController.py
index b80237e47..136982384 100644
--- a/app/http/controllers/TestController.py
+++ b/app/http/controllers/TestController.py
@@ -1,6 +1,6 @@
 from app.jobs.TestJob import TestJob
-from masonite import Queue, Mail
-from masonite.request import Request
+from src.masonite import Queue, Mail
+from src.masonite.request import Request
 
 class TestController:
 
diff --git a/app/http/controllers/UnitTestController.py b/app/http/controllers/UnitTestController.py
index 3e2069c1e..d25a79502 100644
--- a/app/http/controllers/UnitTestController.py
+++ b/app/http/controllers/UnitTestController.py
@@ -1,7 +1,7 @@
 """A UnitTestController Module."""
 
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.request import Request
+from src.masonite.controllers import Controller
 
 
 class UnitTestController(Controller):
diff --git a/app/http/controllers/WelcomeController.py b/app/http/controllers/WelcomeController.py
index 1d47598a2..7fdf8b239 100644
--- a/app/http/controllers/WelcomeController.py
+++ b/app/http/controllers/WelcomeController.py
@@ -1,8 +1,8 @@
 """Welcome The User To Masonite."""
 
-from masonite.view import View
-from masonite.request import Request
-from masonite.controllers import Controller
+from src.masonite.view import View
+from src.masonite.request import Request
+from src.masonite.controllers import Controller
 
 
 class WelcomeController(Controller):
diff --git a/app/http/middleware/AddAttributeMiddleware.py b/app/http/middleware/AddAttributeMiddleware.py
index 2dfd92b93..a8ccab191 100644
--- a/app/http/middleware/AddAttributeMiddleware.py
+++ b/app/http/middleware/AddAttributeMiddleware.py
@@ -1,6 +1,6 @@
 """Add Attribute Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class AddAttributeMiddleware:
diff --git a/app/http/middleware/AuthenticationMiddleware.py b/app/http/middleware/AuthenticationMiddleware.py
index f62bcdd4e..d6c38eeb6 100644
--- a/app/http/middleware/AuthenticationMiddleware.py
+++ b/app/http/middleware/AuthenticationMiddleware.py
@@ -1,6 +1,6 @@
 """Authentication Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class AuthenticationMiddleware:
diff --git a/app/http/middleware/CsrfMiddleware.py b/app/http/middleware/CsrfMiddleware.py
index cb8d6214d..439bae5dc 100644
--- a/app/http/middleware/CsrfMiddleware.py
+++ b/app/http/middleware/CsrfMiddleware.py
@@ -1,6 +1,6 @@
 """CSRF Middleware."""
 
-from masonite.middleware import CsrfMiddleware as Middleware
+from src.masonite.middleware import CsrfMiddleware as Middleware
 
 
 class CsrfMiddleware(Middleware):
diff --git a/app/http/middleware/LoadUserMiddleware.py b/app/http/middleware/LoadUserMiddleware.py
index a87d38e62..4ca1c1368 100644
--- a/app/http/middleware/LoadUserMiddleware.py
+++ b/app/http/middleware/LoadUserMiddleware.py
@@ -1,7 +1,7 @@
 """Load User Middleware."""
 
-from masonite.auth import Auth
-from masonite.request import Request
+from src.masonite.auth import Auth
+from src.masonite.request import Request
 
 
 class LoadUserMiddleware:
diff --git a/app/http/middleware/MiddlewareTest.py b/app/http/middleware/MiddlewareTest.py
index e16ca6f7d..f36c55c8e 100644
--- a/app/http/middleware/MiddlewareTest.py
+++ b/app/http/middleware/MiddlewareTest.py
@@ -1,6 +1,6 @@
 """Middleware Test."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class MiddlewareTest:
diff --git a/app/http/middleware/TestHttpMiddleware.py b/app/http/middleware/TestHttpMiddleware.py
index 655404b57..168fcda76 100644
--- a/app/http/middleware/TestHttpMiddleware.py
+++ b/app/http/middleware/TestHttpMiddleware.py
@@ -1,4 +1,4 @@
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class TestHttpMiddleware:
diff --git a/app/http/middleware/TestMiddleware.py b/app/http/middleware/TestMiddleware.py
index 9f68b7ef4..e8ef6efdf 100644
--- a/app/http/middleware/TestMiddleware.py
+++ b/app/http/middleware/TestMiddleware.py
@@ -1,4 +1,4 @@
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class TestMiddleware:
diff --git a/app/http/middleware/VerifyEmailMiddleware.py b/app/http/middleware/VerifyEmailMiddleware.py
index e673697f9..33dde5517 100644
--- a/app/http/middleware/VerifyEmailMiddleware.py
+++ b/app/http/middleware/VerifyEmailMiddleware.py
@@ -1,6 +1,6 @@
 """Verify Email Middleware."""
 
-from masonite.request import Request
+from src.masonite.request import Request
 
 
 class VerifyEmailMiddleware:
diff --git a/app/jobs/TestJob.py b/app/jobs/TestJob.py
index cf1bf3783..1c8ef8947 100644
--- a/app/jobs/TestJob.py
+++ b/app/jobs/TestJob.py
@@ -1,6 +1,6 @@
 """ A TestJob Queue Job """
 
-from masonite.queues import Queueable
+from src.masonite.queues import Queueable
 
 
 class TestJob(Queueable):
diff --git a/config/application.py b/config/application.py
index fe2cbaff3..886bd4597 100644
--- a/config/application.py
+++ b/config/application.py
@@ -57,4 +57,8 @@
     'app',
 ]
 
-FALSY = False
\ No newline at end of file
+FALSY = False
+
+TEMPLATES={
+    'statuscode': '/src/masonite/snippets/statuscode',
+}
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/masonite/autoload.py b/src/masonite/autoload.py
index 012c89e08..fdfe2ec94 100644
--- a/src/masonite/autoload.py
+++ b/src/masonite/autoload.py
@@ -8,7 +8,7 @@
 import pkgutil
 from pydoc import importlib
 
-from masonite.exceptions import (AutoloadContainerOverwrite, ContainerError,
+from .exceptions import (AutoloadContainerOverwrite, ContainerError,
                                  InvalidAutoloadPath)
 
 
diff --git a/src/masonite/commands/BaseScaffoldCommand.py b/src/masonite/commands/BaseScaffoldCommand.py
index a500e9626..e88bb5bb0 100644
--- a/src/masonite/commands/BaseScaffoldCommand.py
+++ b/src/masonite/commands/BaseScaffoldCommand.py
@@ -1,8 +1,8 @@
 from cleo import Command
 
-from masonite.app import App
-from masonite.helpers.filesystem import make_directory
-from masonite.view import View
+from ..app import App
+from ..helpers.filesystem import make_directory
+from ..view import View
 
 
 class BaseScaffoldCommand(Command):
diff --git a/src/masonite/commands/CommandCommand.py b/src/masonite/commands/CommandCommand.py
index 7227f3b6b..cb59257f5 100644
--- a/src/masonite/commands/CommandCommand.py
+++ b/src/masonite/commands/CommandCommand.py
@@ -1,5 +1,5 @@
 """Creates New Command Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class CommandCommand(BaseScaffoldCommand):
diff --git a/src/masonite/commands/ControllerCommand.py b/src/masonite/commands/ControllerCommand.py
index 91675ef12..266b662fd 100644
--- a/src/masonite/commands/ControllerCommand.py
+++ b/src/masonite/commands/ControllerCommand.py
@@ -1,7 +1,7 @@
 """New Controller Command."""
-from masonite.view import View
-from masonite.app import App
-from masonite.helpers.filesystem import make_directory
+from ..view import View
+from ..app import App
+from ..helpers.filesystem import make_directory
 
 from cleo import Command
 
diff --git a/src/masonite/commands/InfoCommand.py b/src/masonite/commands/InfoCommand.py
index 43f6179bc..3348ace08 100644
--- a/src/masonite/commands/InfoCommand.py
+++ b/src/masonite/commands/InfoCommand.py
@@ -8,7 +8,7 @@
 from cleo import Command
 from tabulate import tabulate
 
-from masonite.__version__ import __version__
+from ..__version__ import __version__
 
 
 class InfoCommand(Command):
@@ -19,7 +19,7 @@ class InfoCommand(Command):
     """
 
     def handle(self):
-        from masonite_cli.application import application
+        from ._cli.application import application
         rows = []
 
         rows.append(['System Information', self._get_system_info()])
diff --git a/src/masonite/commands/JobCommand.py b/src/masonite/commands/JobCommand.py
index 017bc5545..799d0e25a 100644
--- a/src/masonite/commands/JobCommand.py
+++ b/src/masonite/commands/JobCommand.py
@@ -1,5 +1,5 @@
 """New Job Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class JobCommand(BaseScaffoldCommand):
diff --git a/src/masonite/commands/MiddlewareCommand.py b/src/masonite/commands/MiddlewareCommand.py
index 77e7c9fcc..c8b7b2c5c 100644
--- a/src/masonite/commands/MiddlewareCommand.py
+++ b/src/masonite/commands/MiddlewareCommand.py
@@ -1,5 +1,5 @@
 """New Middleware Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class MiddlewareCommand(BaseScaffoldCommand):
diff --git a/src/masonite/commands/MigrateCommand.py b/src/masonite/commands/MigrateCommand.py
index 4da31ad3f..99e7d4ae1 100644
--- a/src/masonite/commands/MigrateCommand.py
+++ b/src/masonite/commands/MigrateCommand.py
@@ -3,7 +3,7 @@
 import sys
 
 from cleo import Command
-from masonite.helpers.migrations import Migrations
+from ..helpers.migrations import Migrations
 
 
 class MigrateCommand(Command):
diff --git a/src/masonite/commands/MigrateResetCommand.py b/src/masonite/commands/MigrateResetCommand.py
index 1b4c9279d..db5920cd1 100644
--- a/src/masonite/commands/MigrateResetCommand.py
+++ b/src/masonite/commands/MigrateResetCommand.py
@@ -3,7 +3,7 @@
 import sys
 
 from cleo import Command
-from masonite.helpers.migrations import Migrations
+from ..helpers.migrations import Migrations
 
 
 class MigrateResetCommand(Command):
diff --git a/src/masonite/commands/MigrateRollbackCommand.py b/src/masonite/commands/MigrateRollbackCommand.py
index 899c4f394..7240fdb96 100644
--- a/src/masonite/commands/MigrateRollbackCommand.py
+++ b/src/masonite/commands/MigrateRollbackCommand.py
@@ -3,7 +3,7 @@
 import sys
 
 from cleo import Command
-from masonite.helpers.migrations import Migrations
+from ..helpers.migrations import Migrations
 
 
 class MigrateRollbackCommand(Command):
diff --git a/src/masonite/commands/MigrateStatusCommand.py b/src/masonite/commands/MigrateStatusCommand.py
index a71a43427..07be04bee 100644
--- a/src/masonite/commands/MigrateStatusCommand.py
+++ b/src/masonite/commands/MigrateStatusCommand.py
@@ -4,7 +4,7 @@
 
 from subprocess import check_output
 from cleo import Command
-from masonite.packages import add_venv_site_packages
+from ..packages import add_venv_site_packages
 
 
 class MigrateStatusCommand(Command):
diff --git a/src/masonite/commands/ModelCommand.py b/src/masonite/commands/ModelCommand.py
index 32b77e3e9..0581b3cdf 100644
--- a/src/masonite/commands/ModelCommand.py
+++ b/src/masonite/commands/ModelCommand.py
@@ -1,7 +1,7 @@
 """New Model Command."""
-from masonite.app import App
-from masonite.helpers.filesystem import make_directory
-from masonite.view import View
+from ..app import App
+from ..helpers.filesystem import make_directory
+from ..view import View
 
 from cleo import Command
 
diff --git a/src/masonite/commands/ProviderCommand.py b/src/masonite/commands/ProviderCommand.py
index ce59c9fca..933200ad0 100644
--- a/src/masonite/commands/ProviderCommand.py
+++ b/src/masonite/commands/ProviderCommand.py
@@ -1,5 +1,5 @@
 """New Providers Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class ProviderCommand(BaseScaffoldCommand):
diff --git a/src/masonite/commands/PublishCommand.py b/src/masonite/commands/PublishCommand.py
index ec697987b..ea90ef50e 100644
--- a/src/masonite/commands/PublishCommand.py
+++ b/src/masonite/commands/PublishCommand.py
@@ -1,6 +1,6 @@
 """Publish Service Providers"""
 from cleo import Command
-from masonite.helpers import config
+from ..helpers import config
 
 
 class PublishCommand(Command):
diff --git a/src/masonite/commands/QueueTableCommand.py b/src/masonite/commands/QueueTableCommand.py
index b373ce54b..b9e8c25d3 100644
--- a/src/masonite/commands/QueueTableCommand.py
+++ b/src/masonite/commands/QueueTableCommand.py
@@ -3,7 +3,7 @@
 
 from cleo import Command
 
-from masonite.helpers.filesystem import copy_migration
+from ..helpers.filesystem import copy_migration
 
 
 class QueueTableCommand(Command):
diff --git a/src/masonite/commands/QueueWorkCommand.py b/src/masonite/commands/QueueWorkCommand.py
index 73521b06c..414cd12f2 100644
--- a/src/masonite/commands/QueueWorkCommand.py
+++ b/src/masonite/commands/QueueWorkCommand.py
@@ -2,7 +2,7 @@
 
 from cleo import Command
 
-from masonite import Queue
+from .. import Queue
 
 
 class QueueWorkCommand(Command):
diff --git a/src/masonite/commands/ServeCommand.py b/src/masonite/commands/ServeCommand.py
index 3648fdf44..ba1b87e53 100644
--- a/src/masonite/commands/ServeCommand.py
+++ b/src/masonite/commands/ServeCommand.py
@@ -5,7 +5,7 @@
 from hupper.logger import DefaultLogger, LogLevel
 from hupper.reloader import Reloader, find_default_monitor_factory
 from cleo import Command
-from masonite.helpers import has_unmigrated_migrations
+from ..helpers import has_unmigrated_migrations
 
 
 class ServeCommand(Command):
diff --git a/src/masonite/commands/TestCommand.py b/src/masonite/commands/TestCommand.py
index 8f4f389a8..ad3349dc1 100644
--- a/src/masonite/commands/TestCommand.py
+++ b/src/masonite/commands/TestCommand.py
@@ -1,5 +1,5 @@
 """Creates New Test Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class TestCommand(BaseScaffoldCommand):
diff --git a/src/masonite/commands/ViewCommand.py b/src/masonite/commands/ViewCommand.py
index 0753d68a0..c5a300a4e 100644
--- a/src/masonite/commands/ViewCommand.py
+++ b/src/masonite/commands/ViewCommand.py
@@ -1,5 +1,5 @@
 """New View Command."""
-from masonite.commands import BaseScaffoldCommand
+from ..commands import BaseScaffoldCommand
 
 
 class ViewCommand(BaseScaffoldCommand):
diff --git a/src/masonite/drivers/broadcast/BroadcastAblyDriver.py b/src/masonite/drivers/broadcast/BroadcastAblyDriver.py
index 570176e01..3459d038a 100644
--- a/src/masonite/drivers/broadcast/BroadcastAblyDriver.py
+++ b/src/masonite/drivers/broadcast/BroadcastAblyDriver.py
@@ -1,9 +1,9 @@
 """Module for using the Ably websocket driver."""
 
-from masonite.contracts import BroadcastContract
-from masonite.drivers import BaseDriver
-from masonite.exceptions import DriverLibraryNotFound
-from masonite.app import App
+from ...contracts import BroadcastContract
+from ...drivers import BaseDriver
+from ...exceptions import DriverLibraryNotFound
+from ...app import App
 
 
 class BroadcastAblyDriver(BroadcastContract, BaseDriver):
diff --git a/src/masonite/drivers/broadcast/BroadcastPusherDriver.py b/src/masonite/drivers/broadcast/BroadcastPusherDriver.py
index 328d0ec1f..bb54790f8 100644
--- a/src/masonite/drivers/broadcast/BroadcastPusherDriver.py
+++ b/src/masonite/drivers/broadcast/BroadcastPusherDriver.py
@@ -1,9 +1,9 @@
 """Module for the Pusher websocket driver."""
 
-from masonite.contracts import BroadcastContract
-from masonite.drivers import BaseDriver
-from masonite.exceptions import DriverLibraryNotFound
-from masonite.helpers import config
+from ...contracts import BroadcastContract
+from ...drivers import BaseDriver
+from ...exceptions import DriverLibraryNotFound
+from ...helpers import config
 
 
 class BroadcastPusherDriver(BroadcastContract, BaseDriver):
diff --git a/src/masonite/drivers/cache/BaseCacheDriver.py b/src/masonite/drivers/cache/BaseCacheDriver.py
index c42c5a61b..a0f90b447 100644
--- a/src/masonite/drivers/cache/BaseCacheDriver.py
+++ b/src/masonite/drivers/cache/BaseCacheDriver.py
@@ -1,6 +1,6 @@
 """Base cache driver module."""
 
-from masonite.drivers import BaseDriver
+from ...drivers import BaseDriver
 
 
 class BaseCacheDriver(BaseDriver):
diff --git a/src/masonite/drivers/cache/CacheDiskDriver.py b/src/masonite/drivers/cache/CacheDiskDriver.py
index a71e4374c..199933980 100644
--- a/src/masonite/drivers/cache/CacheDiskDriver.py
+++ b/src/masonite/drivers/cache/CacheDiskDriver.py
@@ -4,10 +4,10 @@
 import os
 import time
 
-from masonite.app import App
-from masonite.contracts import CacheContract
-from masonite.drivers import BaseCacheDriver
-from masonite.helpers import config
+from ...app import App
+from ...contracts import CacheContract
+from ...drivers import BaseCacheDriver
+from ...helpers import config
 
 
 class CacheDiskDriver(CacheContract, BaseCacheDriver):
diff --git a/src/masonite/drivers/cache/CacheRedisDriver.py b/src/masonite/drivers/cache/CacheRedisDriver.py
index d590f4c87..b629fd532 100644
--- a/src/masonite/drivers/cache/CacheRedisDriver.py
+++ b/src/masonite/drivers/cache/CacheRedisDriver.py
@@ -2,9 +2,9 @@
 
 import os
 
-from masonite.contracts import CacheContract
-from masonite.drivers import BaseCacheDriver
-from masonite.exceptions import DriverLibraryNotFound
+from ...contracts import CacheContract
+from ...drivers import BaseCacheDriver
+from ...exceptions import DriverLibraryNotFound
 
 
 class CacheRedisDriver(CacheContract, BaseCacheDriver):
diff --git a/src/masonite/drivers/mail/MailLogDriver.py b/src/masonite/drivers/mail/MailLogDriver.py
index 9da203a48..6455e298b 100644
--- a/src/masonite/drivers/mail/MailLogDriver.py
+++ b/src/masonite/drivers/mail/MailLogDriver.py
@@ -3,10 +3,10 @@
 import logging
 import os
 
-from masonite.app import App
-from masonite.contracts import MailContract
-from masonite.drivers import BaseMailDriver
-from masonite.view import View
+from ...app import App
+from ...contracts import MailContract
+from ...drivers import BaseMailDriver
+from ...view import View
 
 
 class MailLogDriver(BaseMailDriver, MailContract):
diff --git a/src/masonite/drivers/mail/MailMailgunDriver.py b/src/masonite/drivers/mail/MailMailgunDriver.py
index f58960f82..1401a3b90 100644
--- a/src/masonite/drivers/mail/MailMailgunDriver.py
+++ b/src/masonite/drivers/mail/MailMailgunDriver.py
@@ -1,8 +1,8 @@
 """Mailgun Driver Module."""
 import requests
 
-from masonite.contracts.MailContract import MailContract
-from masonite.drivers import BaseMailDriver
+from ...contracts.MailContract import MailContract
+from ...drivers import BaseMailDriver
 
 
 class MailMailgunDriver(BaseMailDriver, MailContract):
@@ -20,7 +20,7 @@ def send(self, message=None):
 
         if self._queue:
             from wsgi import container
-            from masonite import Queue
+            from .. import Queue
             return container.make(Queue).push(self._send_mail, args=(message,))
 
         return self._send_mail(message)
diff --git a/src/masonite/drivers/mail/MailSmtpDriver.py b/src/masonite/drivers/mail/MailSmtpDriver.py
index 369a89272..e779b5e86 100644
--- a/src/masonite/drivers/mail/MailSmtpDriver.py
+++ b/src/masonite/drivers/mail/MailSmtpDriver.py
@@ -4,8 +4,8 @@
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
-from masonite.contracts.MailContract import MailContract
-from masonite.drivers import BaseMailDriver
+from ...contracts.MailContract import MailContract
+from ...drivers import BaseMailDriver
 
 
 class MailSmtpDriver(BaseMailDriver, MailContract):
@@ -46,7 +46,7 @@ def send(self, message_contents=None):
 
         if self._queue:
             from wsgi import container
-            from masonite import Queue
+            from .. import Queue
             container.make(Queue).push(
                 self._send_mail,
                 args=(self.config.FROM['name'], self.to_address, message.as_string())
diff --git a/src/masonite/drivers/mail/MailTerminalDriver.py b/src/masonite/drivers/mail/MailTerminalDriver.py
index 5f6156178..3cfd7e1d0 100644
--- a/src/masonite/drivers/mail/MailTerminalDriver.py
+++ b/src/masonite/drivers/mail/MailTerminalDriver.py
@@ -2,10 +2,10 @@
 
 import logging
 
-from masonite.app import App
-from masonite.contracts.MailContract import MailContract
-from masonite.drivers import BaseMailDriver
-from masonite.view import View
+from ...app import App
+from ...contracts.MailContract import MailContract
+from ...drivers import BaseMailDriver
+from ...view import View
 
 
 class MailTerminalDriver(BaseMailDriver, MailContract):
diff --git a/src/masonite/drivers/queue/BaseQueueDriver.py b/src/masonite/drivers/queue/BaseQueueDriver.py
index 41e6daaa8..1f7522190 100644
--- a/src/masonite/drivers/queue/BaseQueueDriver.py
+++ b/src/masonite/drivers/queue/BaseQueueDriver.py
@@ -4,8 +4,8 @@
 
 import pendulum
 
-from masonite.drivers import BaseDriver
-from masonite.helpers import HasColoredCommands
+from ...drivers import BaseDriver
+from ...helpers import HasColoredCommands
 
 
 class BaseQueueDriver(BaseDriver, HasColoredCommands):
diff --git a/src/masonite/drivers/queue/QueueAmqpDriver.py b/src/masonite/drivers/queue/QueueAmqpDriver.py
index 7217cddef..4b311814c 100644
--- a/src/masonite/drivers/queue/QueueAmqpDriver.py
+++ b/src/masonite/drivers/queue/QueueAmqpDriver.py
@@ -5,11 +5,11 @@
 import time
 
 import pendulum
-from masonite.contracts import QueueContract
-from masonite.drivers import BaseQueueDriver
-from masonite.exceptions import DriverLibraryNotFound
-from masonite.helpers import HasColoredCommands
-from masonite.queues import Queueable
+from ...contracts import QueueContract
+from ...drivers import BaseQueueDriver
+from ...exceptions import DriverLibraryNotFound
+from ...helpers import HasColoredCommands
+from ...queues import Queueable
 
 
 class QueueAmqpDriver(BaseQueueDriver, QueueContract, HasColoredCommands):
diff --git a/src/masonite/drivers/queue/QueueAsyncDriver.py b/src/masonite/drivers/queue/QueueAsyncDriver.py
index c827c5b18..60f731f27 100644
--- a/src/masonite/drivers/queue/QueueAsyncDriver.py
+++ b/src/masonite/drivers/queue/QueueAsyncDriver.py
@@ -5,11 +5,11 @@
 from concurrent.futures import (ProcessPoolExecutor, ThreadPoolExecutor,
                                 as_completed)
 
-from masonite.app import App
-from masonite.contracts import QueueContract
-from masonite.drivers import BaseQueueDriver
-from masonite.exceptions import QueueException
-from masonite.helpers import HasColoredCommands, config
+from ...app import App
+from ...contracts import QueueContract
+from ...drivers import BaseQueueDriver
+from ...exceptions import QueueException
+from ...helpers import HasColoredCommands, config
 
 
 class QueueAsyncDriver(BaseQueueDriver, HasColoredCommands, QueueContract):
diff --git a/src/masonite/drivers/session/SessionCookieDriver.py b/src/masonite/drivers/session/SessionCookieDriver.py
index 1adb3f793..ff560d124 100644
--- a/src/masonite/drivers/session/SessionCookieDriver.py
+++ b/src/masonite/drivers/session/SessionCookieDriver.py
@@ -2,10 +2,10 @@
 
 import json
 
-from masonite.contracts import SessionContract
-from masonite.drivers import BaseDriver
-from masonite.request import Request
-from masonite.app import App
+from ...contracts import SessionContract
+from ...drivers import BaseDriver
+from ...request import Request
+from ...app import App
 
 
 class SessionCookieDriver(SessionContract, BaseDriver):
diff --git a/src/masonite/drivers/session/SessionMemoryDriver.py b/src/masonite/drivers/session/SessionMemoryDriver.py
index 1037dcbd8..e324ecc01 100644
--- a/src/masonite/drivers/session/SessionMemoryDriver.py
+++ b/src/masonite/drivers/session/SessionMemoryDriver.py
@@ -1,8 +1,8 @@
 """Session Memory Module."""
 
-from masonite.contracts import SessionContract
-from masonite.drivers import BaseDriver
-from masonite.app import App
+from ...contracts import SessionContract
+from ...drivers import BaseDriver
+from ...app import App
 
 
 class SessionMemoryDriver(SessionContract, BaseDriver):
diff --git a/src/masonite/drivers/storage/StorageDiskDriver.py b/src/masonite/drivers/storage/StorageDiskDriver.py
index ac38706a3..aec29c2af 100644
--- a/src/masonite/drivers/storage/StorageDiskDriver.py
+++ b/src/masonite/drivers/storage/StorageDiskDriver.py
@@ -2,9 +2,9 @@
 import pathlib
 import shutil
 
-from masonite import Upload
-from masonite.contracts import StorageContract
-from masonite.drivers import BaseDriver
+from ... import Upload
+from ...contracts import StorageContract
+from ...drivers import BaseDriver
 
 
 class StorageDiskDriver(BaseDriver, StorageContract):
diff --git a/src/masonite/exception_handler.py b/src/masonite/exception_handler.py
index 5959915cf..a326f5b3a 100644
--- a/src/masonite/exception_handler.py
+++ b/src/masonite/exception_handler.py
@@ -10,12 +10,12 @@
 import sys
 import traceback
 
-from masonite.app import App
-from masonite.exceptions import DumpException
-from masonite.request import Request
-from masonite.response import Response
-from masonite.view import View
-from masonite.helpers import config
+from .app import App
+from .exceptions import DumpException
+from .request import Request
+from .response import Response
+from .view import View
+from .helpers import config
 
 package_directory = os.path.dirname(os.path.realpath(__file__))
 
diff --git a/src/masonite/helpers/routes.py b/src/masonite/helpers/routes.py
index 1a75967ad..560b69671 100644
--- a/src/masonite/helpers/routes.py
+++ b/src/masonite/helpers/routes.py
@@ -37,7 +37,7 @@ def get(url, controller):
     Returns:
         masonite.routes.Get -- The Masonite Get class.
     """
-    from masonite.routes import Get
+    from ..routes import Get
 
     return Get().route(url, controller)
 
@@ -54,7 +54,7 @@ def match(method_type, url, controller):
     Returns:
         masonite.routes.Get -- The Masonite Get class.
     """
-    from masonite.routes import Match
+    from ..routes import Match
 
     return Match(method_type).route(url, controller)
 
@@ -70,7 +70,7 @@ def post(url, controller):
     Returns:
         masonite.routes.Post -- The Masonite Post class.
     """
-    from masonite.routes import Post
+    from ..routes import Post
 
     return Post().route(url, controller)
 
@@ -86,7 +86,7 @@ def delete(url, controller):
     Returns:
         masonite.routes.Delete -- The Masonite Delete class.
     """
-    from masonite.routes import Delete
+    from ..routes import Delete
 
     return Delete().route(url, controller)
 
@@ -102,7 +102,7 @@ def put(url, controller):
     Returns:
         masonite.routes.Put -- The Masonite Put class.
     """
-    from masonite.routes import Put
+    from ..routes import Put
 
     return Put().route(url, controller)
 
@@ -118,7 +118,7 @@ def patch(url, controller):
     Returns:
         masonite.routes.Patch -- The Masonite Patch class.
     """
-    from masonite.routes import Patch
+    from ..routes import Patch
 
     return Patch().route(url, controller)
 
diff --git a/src/masonite/helpers/sign.py b/src/masonite/helpers/sign.py
index 19138f3f7..b44568af2 100644
--- a/src/masonite/helpers/sign.py
+++ b/src/masonite/helpers/sign.py
@@ -1,4 +1,4 @@
-from masonite.auth import Sign
+from ..auth import Sign
 
 
 def sign(value):
diff --git a/src/masonite/hook.py b/src/masonite/hook.py
index 456b89a5b..5b1ec4ba4 100644
--- a/src/masonite/hook.py
+++ b/src/masonite/hook.py
@@ -1,6 +1,6 @@
 """Module for the Hook class."""
 
-from masonite.app import App
+from .app import App
 
 
 class Hook:
diff --git a/src/masonite/middleware/CorsMiddleware.py b/src/masonite/middleware/CorsMiddleware.py
index 2869c79fa..008d76975 100644
--- a/src/masonite/middleware/CorsMiddleware.py
+++ b/src/masonite/middleware/CorsMiddleware.py
@@ -1,7 +1,7 @@
 """CORS Middleware."""
 
-from masonite.helpers import config
-from masonite.request import Request
+from ..helpers import config
+from ..request import Request
 
 
 class CorsMiddleware:
diff --git a/src/masonite/middleware/CsrfMiddleware.py b/src/masonite/middleware/CsrfMiddleware.py
index 741cab8d9..ae8ef08b4 100644
--- a/src/masonite/middleware/CsrfMiddleware.py
+++ b/src/masonite/middleware/CsrfMiddleware.py
@@ -2,10 +2,10 @@
 
 from jinja2 import Markup
 
-from masonite.auth import Csrf
-from masonite.exceptions import InvalidCSRFToken
-from masonite.request import Request
-from masonite.view import View
+from ..auth import Csrf
+from ..exceptions import InvalidCSRFToken
+from ..request import Request
+from ..view import View
 
 
 class CsrfMiddleware:
diff --git a/src/masonite/middleware/MaintenanceModeMiddleware.py b/src/masonite/middleware/MaintenanceModeMiddleware.py
index 40c7321da..c0a334d30 100644
--- a/src/masonite/middleware/MaintenanceModeMiddleware.py
+++ b/src/masonite/middleware/MaintenanceModeMiddleware.py
@@ -1,6 +1,6 @@
 """Maintainance Mode Middleware."""
 import os
-from masonite.request import Request
+from ..request import Request
 from config import application
 
 
diff --git a/src/masonite/middleware/ResponseMiddleware.py b/src/masonite/middleware/ResponseMiddleware.py
index 0c5b7aa06..8daaf0544 100644
--- a/src/masonite/middleware/ResponseMiddleware.py
+++ b/src/masonite/middleware/ResponseMiddleware.py
@@ -1,7 +1,7 @@
 
-from masonite.app import App
-from masonite.request import Request
-from masonite.response import Response
+from ..app import App
+from ..request import Request
+from ..response import Response
 
 
 class ResponseMiddleware:
diff --git a/src/masonite/middleware/SecureHeadersMiddleware.py b/src/masonite/middleware/SecureHeadersMiddleware.py
index d43bf6c88..48bf7abcd 100644
--- a/src/masonite/middleware/SecureHeadersMiddleware.py
+++ b/src/masonite/middleware/SecureHeadersMiddleware.py
@@ -1,6 +1,6 @@
 """SecureHeaders Middleware."""
 
-from masonite.request import Request
+from ..request import Request
 
 
 class SecureHeadersMiddleware:
diff --git a/src/masonite/provider.py b/src/masonite/provider.py
index f815de25e..9a8d0cd86 100644
--- a/src/masonite/provider.py
+++ b/src/masonite/provider.py
@@ -1,7 +1,7 @@
 """Module for the Service Provider."""
 
-from masonite.helpers import random_string
-from masonite.helpers.filesystem import copy_migration
+from .helpers import random_string
+from .helpers.filesystem import copy_migration
 from .packages import append_file
 
 
diff --git a/src/masonite/providers/AppProvider.py b/src/masonite/providers/AppProvider.py
index b303e14c0..0d25e30b2 100644
--- a/src/masonite/providers/AppProvider.py
+++ b/src/masonite/providers/AppProvider.py
@@ -1,8 +1,8 @@
 """An AppProvider Service Provider."""
 
-from masonite.auth import Auth
-from masonite.autoload import Autoload
-from masonite.commands import (AuthCommand, CommandCommand, ControllerCommand,
+from ..auth import Auth
+from ..autoload import Autoload
+from ..commands import (AuthCommand, CommandCommand, ControllerCommand,
                                DownCommand, InfoCommand, InstallCommand,
                                JobCommand, KeyCommand, MakeMigrationCommand,
                                MiddlewareCommand, MigrateCommand,
@@ -14,18 +14,18 @@
                                RoutesCommand, SeedCommand, SeedRunCommand,
                                ServeCommand, TestCommand, TinkerCommand, UpCommand,
                                ViewCommand)
-from masonite.exception_handler import DumpHandler, ExceptionHandler
-from masonite.helpers import config
-from masonite.helpers.routes import flatten_routes
-from masonite.hook import Hook
-from masonite.provider import ServiceProvider
-from masonite.request import Request
-from masonite.response import Response
-from masonite.routes import Route
+from ..exception_handler import DumpHandler, ExceptionHandler
+from ..helpers import config
+from ..helpers.routes import flatten_routes
+from ..hook import Hook
+from ..provider import ServiceProvider
+from ..request import Request
+from ..response import Response
+from ..routes import Route
 
-from masonite.managers import AuthManager
-from masonite.drivers import AuthCookieDriver, AuthJwtDriver
-from masonite.helpers import load
+from ..managers import AuthManager
+from ..drivers import AuthCookieDriver, AuthJwtDriver
+from ..helpers import load
 
 
 class AppProvider(ServiceProvider):
diff --git a/src/masonite/providers/BroadcastProvider.py b/src/masonite/providers/BroadcastProvider.py
index ec9cf327b..041ca4829 100644
--- a/src/masonite/providers/BroadcastProvider.py
+++ b/src/masonite/providers/BroadcastProvider.py
@@ -1,10 +1,10 @@
 """A RedirectionProvider Service Provider."""
 
-from masonite.drivers import BroadcastAblyDriver, BroadcastPusherDriver
-from masonite.managers import BroadcastManager
-from masonite.provider import ServiceProvider
-from masonite import Broadcast
-from masonite.helpers import config
+from ..drivers import BroadcastAblyDriver, BroadcastPusherDriver
+from ..managers import BroadcastManager
+from ..provider import ServiceProvider
+from .. import Broadcast
+from ..helpers import config
 
 
 class BroadcastProvider(ServiceProvider):
diff --git a/src/masonite/providers/CacheProvider.py b/src/masonite/providers/CacheProvider.py
index 90acb8170..306bee446 100644
--- a/src/masonite/providers/CacheProvider.py
+++ b/src/masonite/providers/CacheProvider.py
@@ -1,10 +1,10 @@
 """A Cache Service Provider."""
 
-from masonite import Cache
-from masonite.drivers import CacheDiskDriver, CacheRedisDriver
-from masonite.managers import CacheManager
-from masonite.provider import ServiceProvider
-from masonite.helpers import config
+from .. import Cache
+from ..drivers import CacheDiskDriver, CacheRedisDriver
+from ..managers import CacheManager
+from ..provider import ServiceProvider
+from ..helpers import config
 
 
 class CacheProvider(ServiceProvider):
diff --git a/src/masonite/providers/CorsProvider.py b/src/masonite/providers/CorsProvider.py
index ac2d9ee74..c8eff5751 100644
--- a/src/masonite/providers/CorsProvider.py
+++ b/src/masonite/providers/CorsProvider.py
@@ -1,7 +1,7 @@
-from masonite.provider import ServiceProvider
-from masonite.request import Request
-from masonite.response import Response
-from masonite.helpers import config
+from ..provider import ServiceProvider
+from ..request import Request
+from ..response import Response
+from ..helpers import config
 
 
 class CorsProvider(ServiceProvider):
diff --git a/src/masonite/providers/CsrfProvider.py b/src/masonite/providers/CsrfProvider.py
index 1a83c9842..e5d5d8fce 100644
--- a/src/masonite/providers/CsrfProvider.py
+++ b/src/masonite/providers/CsrfProvider.py
@@ -1,7 +1,7 @@
 """A Csrf Service Provider."""
 
-from masonite.auth import Csrf
-from masonite.provider import ServiceProvider
+from ..auth import Csrf
+from ..provider import ServiceProvider
 
 
 class CsrfProvider(ServiceProvider):
diff --git a/src/masonite/providers/HelpersProvider.py b/src/masonite/providers/HelpersProvider.py
index ca1bf336a..1d77a7bc4 100644
--- a/src/masonite/providers/HelpersProvider.py
+++ b/src/masonite/providers/HelpersProvider.py
@@ -3,14 +3,14 @@
 import builtins
 import os
 
-from masonite.exception_handler import DD
-from masonite.helpers.view_helpers import back, set_request_method, hidden
-from masonite.helpers.sign import sign, unsign, decrypt, encrypt
-from masonite.helpers import config, optional
-from masonite.provider import ServiceProvider
-from masonite.view import View
-from masonite.request import Request
-from masonite.managers import MailManager
+from ..exception_handler import DD
+from ..helpers.view_helpers import back, set_request_method, hidden
+from ..helpers.sign import sign, unsign, decrypt, encrypt
+from ..helpers import config, optional
+from ..provider import ServiceProvider
+from ..view import View
+from ..request import Request
+from ..managers import MailManager
 
 
 class HelpersProvider(ServiceProvider):
diff --git a/src/masonite/providers/MailProvider.py b/src/masonite/providers/MailProvider.py
index 3f0e2fccc..b653212db 100644
--- a/src/masonite/providers/MailProvider.py
+++ b/src/masonite/providers/MailProvider.py
@@ -1,11 +1,11 @@
 """A Mail Service Provider."""
 
-from masonite.drivers import MailMailgunDriver, MailSmtpDriver, \
+from ..drivers import MailMailgunDriver, MailSmtpDriver, \
     MailLogDriver, MailTerminalDriver
-from masonite.managers import MailManager
-from masonite.provider import ServiceProvider
-from masonite import Mail
-from masonite.helpers import config
+from ..managers import MailManager
+from ..provider import ServiceProvider
+from .. import Mail
+from ..helpers import config
 
 
 class MailProvider(ServiceProvider):
diff --git a/src/masonite/providers/QueueProvider.py b/src/masonite/providers/QueueProvider.py
index 55838b567..367547652 100644
--- a/src/masonite/providers/QueueProvider.py
+++ b/src/masonite/providers/QueueProvider.py
@@ -1,11 +1,11 @@
 """A RedirectionProvider Service Provider."""
 
 
-from masonite.drivers import QueueAsyncDriver, QueueAmqpDriver
-from masonite.managers import QueueManager
-from masonite.provider import ServiceProvider
-from masonite import Queue
-from masonite.helpers import config
+from ..drivers import QueueAsyncDriver, QueueAmqpDriver
+from ..managers import QueueManager
+from ..provider import ServiceProvider
+from .. import Queue
+from ..helpers import config
 
 
 class QueueProvider(ServiceProvider):
diff --git a/src/masonite/providers/RouteProvider.py b/src/masonite/providers/RouteProvider.py
index a9ad51a77..67711b806 100644
--- a/src/masonite/providers/RouteProvider.py
+++ b/src/masonite/providers/RouteProvider.py
@@ -1,10 +1,10 @@
 """A RouteProvider Service Provider."""
 
-from masonite.helpers.routes import create_matchurl
-from masonite.provider import ServiceProvider
-from masonite.request import Request
-from masonite.response import Response
-from masonite.routes import Route
+from ..helpers.routes import create_matchurl
+from ..provider import ServiceProvider
+from ..request import Request
+from ..response import Response
+from ..routes import Route
 
 
 class RouteProvider(ServiceProvider):
diff --git a/src/masonite/providers/SassProvider.py b/src/masonite/providers/SassProvider.py
index 72a0ab233..4ed88ef98 100644
--- a/src/masonite/providers/SassProvider.py
+++ b/src/masonite/providers/SassProvider.py
@@ -1,7 +1,7 @@
 """A SassProvider Service Provider."""
 
-from masonite.provider import ServiceProvider
-from masonite.storage import Storage
+from ..provider import ServiceProvider
+from ..storage import Storage
 
 
 class SassProvider(ServiceProvider):
diff --git a/src/masonite/providers/SessionProvider.py b/src/masonite/providers/SessionProvider.py
index eb109cbdf..ca5d5684f 100644
--- a/src/masonite/providers/SessionProvider.py
+++ b/src/masonite/providers/SessionProvider.py
@@ -1,12 +1,12 @@
 """A RedirectionProvider Service Provider."""
 
-from masonite.drivers import SessionCookieDriver, SessionMemoryDriver
-from masonite.managers import SessionManager
-from masonite.provider import ServiceProvider
-from masonite.view import View
-from masonite.request import Request
-from masonite import Session
-from masonite.helpers import config
+from ..drivers import SessionCookieDriver, SessionMemoryDriver
+from ..managers import SessionManager
+from ..provider import ServiceProvider
+from ..view import View
+from ..request import Request
+from .. import Session
+from ..helpers import config
 
 
 class SessionProvider(ServiceProvider):
diff --git a/src/masonite/providers/StatusCodeProvider.py b/src/masonite/providers/StatusCodeProvider.py
index 145851961..5cc5fdf7c 100644
--- a/src/masonite/providers/StatusCodeProvider.py
+++ b/src/masonite/providers/StatusCodeProvider.py
@@ -1,8 +1,8 @@
 """A StatusProvider Service Provider."""
 
-from masonite.response import Response
-from masonite.provider import ServiceProvider
-
+from ..response import Response
+from ..provider import ServiceProvider
+from ..helpers import config
 
 class ServerErrorExceptionHook:
 
@@ -18,7 +18,7 @@ def load(self, app):
             rendered_view = app.make('View')('errors/500')
         else:
             rendered_view = app.make('View')(
-                '/masonite/snippets/statuscode', {'code': '500 Internal Server Error'})
+                config('application.templates.statuscode', '/masonite/snippets/statuscode'), {'code': '500 Internal Server Error'})
 
         request.app().make(Response).view(rendered_view)
 
@@ -45,7 +45,7 @@ def boot(self):
                     rendered_view = self.app.make('View')(
                         'errors/{}'.format(request.get_status()))
                 else:
-                    rendered_view = self.app.make('View')('/masonite/snippets/statuscode', {
+                    rendered_view = self.app.make('View')(config('application.templates.statuscode', '/masonite/snippets/statuscode'), {
                         'code': request.get_status_code()
                     })
 
diff --git a/src/masonite/providers/UploadProvider.py b/src/masonite/providers/UploadProvider.py
index e3580d447..552ea5e93 100644
--- a/src/masonite/providers/UploadProvider.py
+++ b/src/masonite/providers/UploadProvider.py
@@ -1,12 +1,12 @@
 """An Upload Service Provider."""
 
-from masonite.drivers import UploadDiskDriver, UploadS3Driver
-from masonite.helpers.static import static
-from masonite.managers import UploadManager
-from masonite.provider import ServiceProvider
-from masonite.view import View
-from masonite import Upload
-from masonite.helpers import config
+from ..drivers import UploadDiskDriver, UploadS3Driver
+from ..helpers.static import static
+from ..managers import UploadManager
+from ..provider import ServiceProvider
+from ..view import View
+from .. import Upload
+from ..helpers import config
 
 
 class UploadProvider(ServiceProvider):
diff --git a/src/masonite/providers/ViewProvider.py b/src/masonite/providers/ViewProvider.py
index 3710d2089..210d35832 100644
--- a/src/masonite/providers/ViewProvider.py
+++ b/src/masonite/providers/ViewProvider.py
@@ -1,7 +1,9 @@
 """A View Service Provider."""
 
-from masonite.provider import ServiceProvider
-from masonite.view import View
+from jinja2 import FileSystemLoader
+
+from ..provider import ServiceProvider
+from ..view import View
 
 
 class ViewProvider(ServiceProvider):
@@ -13,7 +15,8 @@ def register(self):
         self.app.bind('ViewClass', view)
         self.app.bind('View', view.render)
 
-    def boot(self):
+    def boot(self, view: View):
+        view.add_environment('src/masonite/snippets', loader=FileSystemLoader)
         self.publishes_migrations([
             'storage/append_from.txt'
         ])
diff --git a/src/masonite/providers/WhitenoiseProvider.py b/src/masonite/providers/WhitenoiseProvider.py
index e032e9c00..5adf52638 100644
--- a/src/masonite/providers/WhitenoiseProvider.py
+++ b/src/masonite/providers/WhitenoiseProvider.py
@@ -2,8 +2,8 @@
 
 from whitenoise import WhiteNoise
 
-from masonite.provider import ServiceProvider
-from masonite.helpers import config
+from ..provider import ServiceProvider
+from ..helpers import config
 
 
 class WhitenoiseProvider(ServiceProvider):
diff --git a/src/masonite/view.py b/src/masonite/view.py
index d2ae19614..58dcfcc9d 100644
--- a/src/masonite/view.py
+++ b/src/masonite/view.py
@@ -189,6 +189,7 @@ def add_environment(self, template_location, loader=PackageLoader):
         Keyword Arguments:
             loader {jinja2.Loader} -- Type of Jinja2 loader to use. (default: {jinja2.PackageLoader})
         """
+        # print('loading', template_location)
         if loader == PackageLoader:
             template_location = template_location.split(self._splice)
 
diff --git a/storage/compiled/style.css b/storage/compiled/style.css
new file mode 100644
index 000000000..831a52d9b
--- /dev/null
+++ b/storage/compiled/style.css
@@ -0,0 +1,41 @@
+html, body {
+  background-color: #fff;
+  color: #636b6f;
+  font-family: "Raleway", sans-serif;
+  font-weight: 100;
+  height: 100vh;
+  margin: 0; }
+
+.full-height {
+  height: 100vh; }
+
+.flex-center {
+  align-items: center;
+  display: flex;
+  justify-content: center; }
+
+.position-ref {
+  position: relative; }
+
+.top-right {
+  position: absolute;
+  right: 10px;
+  top: 18px; }
+
+.content {
+  text-align: center; }
+
+.title {
+  font-size: 84px; }
+
+.links > a {
+  color: #636b6f;
+  padding: 0 25px;
+  font-size: 12px;
+  font-weight: 600;
+  letter-spacing: .1rem;
+  text-decoration: none;
+  text-transform: uppercase; }
+
+.m-b-md {
+  margin-bottom: 30px; }
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index a71edde38..8d956163f 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -10,7 +10,7 @@
 from src.masonite.helpers import password as bcrypt_password
 from src.masonite.routes import Get
 from src.masonite.request import Request
-from src.masonite.snippets.auth.controllers.ConfirmController import \
+from app.http.controllers.ConfirmController import \
     ConfirmController
 from src.masonite.testing import TestCase
 from src.masonite.testsuite.TestSuite import generate_wsgi

From db30083c359b25e70677c046ee0f5153842c736a Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 22:29:00 -0400
Subject: [PATCH 25/59] finished src refactor

---
 bootstrap/start.py                | 2 +-
 config/application.py             | 1 +
 setup.py                          | 1 +
 src/masonite/exception_handler.py | 2 +-
 src/masonite/testing/TestCase.py  | 6 +++---
 tests/core/test_responsable.py    | 4 ++++
 wsgi.py                           | 4 ++--
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bootstrap/start.py b/bootstrap/start.py
index 6e2c30bf0..5116f7f7f 100644
--- a/bootstrap/start.py
+++ b/bootstrap/start.py
@@ -1,6 +1,6 @@
 """Start of Application. This function is the gunicorn server."""
 
-from masonite.environment import LoadEnvironment
+from src.masonite.environment import LoadEnvironment
 
 """Load Environment Variables
 Take environment variables from the .env file and load them in.
diff --git a/config/application.py b/config/application.py
index 886bd4597..f17c7a073 100644
--- a/config/application.py
+++ b/config/application.py
@@ -61,4 +61,5 @@
 
 TEMPLATES={
     'statuscode': '/src/masonite/snippets/statuscode',
+    'exceptions': '/src/masonite/snippets/exception'
 }
diff --git a/setup.py b/setup.py
index 174e1ee97..7bad4f03a 100644
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@
     long_description_content_type='text/markdown',
     author=meta['__author__'],
     author_email=meta['__author_email__'],
+    package_dir={'': 'src'},
     url=meta['__url__'],
     keywords=['masonite', 'python web framework', 'python3'],
     licence=meta['__licence__'],
diff --git a/src/masonite/exception_handler.py b/src/masonite/exception_handler.py
index a326f5b3a..b2ab16ade 100644
--- a/src/masonite/exception_handler.py
+++ b/src/masonite/exception_handler.py
@@ -96,7 +96,7 @@ def handle(self, _):
             last_stacktrace = []
             second_to_last_stacktrace = []
 
-        self.response.view(self._app.make('View')('/masonite/snippets/exception',
+        self.response.view(self._app.make('View')(config('application.templates.exceptions', '/masonite/snippets/exception'),
                                                {
                                                    'exception': self._exception,
                                                    'split_exception': str(self._exception).split(' '),
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index 11139be54..cad61d685 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -284,10 +284,10 @@ def create_container(self):
         from config import providers
 
         container.bind('WSGI', generate_wsgi())
-        container.bind('Application', application)
+        # container.bind('Application', application)
         container.bind('Container', container)
 
-        container.bind('ProvidersConfig', providers)
+        # container.bind('ProvidersConfig', providers)
         container.bind('Providers', [])
         container.bind('WSGIProviders', [])
 
@@ -299,7 +299,7 @@ def create_container(self):
         once if the wsgi attribute on a provider is False.
         """
 
-        for provider in container.make('ProvidersConfig').PROVIDERS:
+        for provider in providers.PROVIDERS:
             located_provider = provider()
             located_provider.load_app(container).register()
             if located_provider.wsgi:
diff --git a/tests/core/test_responsable.py b/tests/core/test_responsable.py
index ac4cd6741..c485bcf59 100644
--- a/tests/core/test_responsable.py
+++ b/tests/core/test_responsable.py
@@ -1,10 +1,14 @@
 from src.masonite.testing import TestCase
+from src.masonite.routes import Get
 
 
 class TestResponsable(TestCase):
 
     def setUp(self):
         super().setUp()
+        self.routes(only=[
+            Get('/test/mail', 'TestController@mail')
+        ])
 
     def test_mail_can_respond(self):
         self.assertTrue(self.get('/test/mail').contains('mail'))
diff --git a/wsgi.py b/wsgi.py
index 478de9811..22ae98924 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,10 +1,10 @@
 """First Entry For The WSGI Server."""
 
-from masonite.app import App
+from src.masonite.app import App
 
 from bootstrap.start import app
 from config import application, providers
-from masonite.helpers import config
+from src.masonite.helpers import config
 
 """Instantiate Container And Perform Important Bindings
 Some Service providers need important bindings like the WSGI application

From 2d006d82f5bc3bc94fcbf1804dbc04fce4c808c8 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 20 Oct 2019 22:37:41 -0400
Subject: [PATCH 26/59] fixed version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 7bad4f03a..018374e39 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 meta = {}
-with open(os.path.join(here, 'masonite', '__version__.py'), 'r') as f:
+with open(os.path.join(here, 'src/masonite', '__version__.py'), 'r') as f:
     exec(f.read(), meta)
 
 with open('README.md', 'r') as f:

From b6e908368ebe5511a738dd1aa7f1c00508a5aace Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 15:38:53 -0400
Subject: [PATCH 27/59] fixed tests between 2.2 and 2.3

---
 src/masonite/drivers/queue/QueueDatabaseDriver.py |  8 ++++----
 tests/core/test_mail_log_drivers.py               |  2 --
 tests/core/test_mail_smtp_driver.py               | 15 +++++++--------
 tests/core/test_response.py                       |  3 ++-
 tests/core/test_routes.py                         |  5 ++---
 tests/listeners/test_exception_listener.py        |  6 +++---
 tests/queues/test_drivers.py                      |  1 -
 7 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/masonite/drivers/queue/QueueDatabaseDriver.py b/src/masonite/drivers/queue/QueueDatabaseDriver.py
index c22eefabf..fd6602636 100644
--- a/src/masonite/drivers/queue/QueueDatabaseDriver.py
+++ b/src/masonite/drivers/queue/QueueDatabaseDriver.py
@@ -5,10 +5,10 @@
 import time
 
 import pendulum
-from masonite.contracts import QueueContract
-from masonite.drivers import BaseQueueDriver
-from masonite.helpers import HasColoredCommands, parse_human_time
-from masonite.queues import Queueable
+from ...contracts import QueueContract
+from ...drivers import BaseQueueDriver
+from ...helpers import HasColoredCommands, parse_human_time
+from ...queues import Queueable
 
 
 class QueueDatabaseDriver(BaseQueueDriver, HasColoredCommands, QueueContract):
diff --git a/tests/core/test_mail_log_drivers.py b/tests/core/test_mail_log_drivers.py
index 34983300e..fbf5f0a10 100644
--- a/tests/core/test_mail_log_drivers.py
+++ b/tests/core/test_mail_log_drivers.py
@@ -35,8 +35,6 @@ def setUp(self):
         self.app = self.app.bind('Container', self.app)
 
         self.app.bind('Test', object)
-        # self.app.bind('View', View(self.app))
-        self.app.bind('MailConfig', mail)
         viewClass = View(self.app)
         self.app.bind('ViewClass', viewClass)
         self.app.bind('View', viewClass.render)
diff --git a/tests/core/test_mail_smtp_driver.py b/tests/core/test_mail_smtp_driver.py
index 0a9d4908a..6badae281 100644
--- a/tests/core/test_mail_smtp_driver.py
+++ b/tests/core/test_mail_smtp_driver.py
@@ -1,11 +1,11 @@
 from config import mail
-from masonite import env
-from masonite.app import App
-from masonite.drivers import MailMailgunDriver as Mailgun
-from masonite.drivers import MailSmtpDriver as MailDriver
-from masonite.environment import LoadEnvironment
-from masonite.managers.MailManager import MailManager
-from masonite.view import View
+from src.masonite import env
+from src.masonite.app import App
+from src.masonite.drivers import MailMailgunDriver as Mailgun
+from src.masonite.drivers import MailSmtpDriver as MailDriver
+from src.masonite.environment import LoadEnvironment
+from src.masonite.managers.MailManager import MailManager
+from src.masonite.view import View
 import unittest
 
 LoadEnvironment()
@@ -22,7 +22,6 @@ def setUp(self):
         self.app.bind('Container', self.app)
 
         self.app.bind('Test', object)
-        self.app.bind('MailConfig', mail)
         self.app.bind('MailSmtpDriver', MailDriver)
         self.app.bind('MailMailgunDriver', Mailgun)
         viewClass = View(self.app)
diff --git a/tests/core/test_response.py b/tests/core/test_response.py
index 8fd82fbbc..052617d7b 100644
--- a/tests/core/test_response.py
+++ b/tests/core/test_response.py
@@ -12,7 +12,8 @@
 from src.masonite.response import Response
 from src.masonite.testsuite import generate_wsgi
 from src.masonite.view import View
-from config.factories import factory
+from src.masonite.testing import TestCase
+from src.masonite.routes import Get
 from config.factories import factory
 
 
diff --git a/tests/core/test_routes.py b/tests/core/test_routes.py
index 245c03ada..ed6b9af0d 100644
--- a/tests/core/test_routes.py
+++ b/tests/core/test_routes.py
@@ -1,8 +1,6 @@
 
 import unittest
 
-from masonite.testing import TestCase
-
 from app.http.controllers.subdirectory.SubController import SubController
 from src.masonite.app import App
 from src.masonite.exceptions import (InvalidRouteCompileException,
@@ -12,8 +10,9 @@
 from src.masonite.routes import (Connect, Delete, Get, Head, Match, Options,
                                  Patch, Post, Put, Redirect, Route, RouteGroup,
                                  Trace)
+from src.masonite.testing import TestCase
 from src.masonite.testsuite.TestSuite import generate_wsgi
-
+from src.masonite.exceptions import RouteNotFoundException
 
 class TestRoutes(unittest.TestCase):
 
diff --git a/tests/listeners/test_exception_listener.py b/tests/listeners/test_exception_listener.py
index ae21c4f91..d8579aefa 100644
--- a/tests/listeners/test_exception_listener.py
+++ b/tests/listeners/test_exception_listener.py
@@ -1,6 +1,6 @@
-from masonite.testing import TestCase
-from masonite.request import Request
-from masonite.listeners import BaseExceptionListener
+from src.masonite.testing import TestCase
+from src.masonite.request import Request
+from src.masonite.listeners import BaseExceptionListener
 from routes.web import ROUTES
 class ExceptionListener(BaseExceptionListener):
 
diff --git a/tests/queues/test_drivers.py b/tests/queues/test_drivers.py
index 922764ac9..b581e94f4 100644
--- a/tests/queues/test_drivers.py
+++ b/tests/queues/test_drivers.py
@@ -43,7 +43,6 @@ def setUp(self):
         self.app.bind('QueueAsyncDriver', QueueAsyncDriver)
         self.app.bind('QueueAmqpDriver', QueueAmqpDriver)
         self.app.bind('QueueDatabaseDriver', QueueDatabaseDriver)
-        self.app.bind('QueueConfig', queue)
         self.app.bind('Queueable', Queueable)
         self.app.bind('Container', self.app)
         self.app.bind('QueueManager', QueueManager(self.app))

From bfbeb326adb506ed53e3c967de6d4de3bcae18e0 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 15:40:58 -0400
Subject: [PATCH 28/59] fixed duplicate error for circleci

---
 .circleci/config.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74d690709..cea6d5626 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,16 +38,6 @@ jobs:
         - checkout
         - install
         - run: make test
-    python38:
-      docker:
-        - image: circleci/python:3.8.0b2-buster
-          auth:
-            username: jmancuso9  # can specify string literal values
-            password: $DOCKERHUB_PASSWORD
-      steps:
-        - checkout
-        - install
-        - run: make test
     python38:
       docker:
         - image: circleci/python:3.8

From a967cd653962b5182a1099662edb38d794752290 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 15:44:50 -0400
Subject: [PATCH 29/59] removed duplicate key in build steps

---
 .circleci/config.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cea6d5626..d27db24f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -84,10 +84,6 @@ workflows:
           filters:  # required since `deploy` has tag filters AND requires `build`
             tags:
               only: /^.*/
-      - python38:
-          filters:  # required since `deploy` has tag filters AND requires `build`
-            tags:
-              only: /^.*/
       - CodeCoverage:
           requires:
               - build

From abee88b6c6d6801e0ca2d89ecd1f9d8acd2eac41 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 16:11:35 -0400
Subject: [PATCH 30/59] removed unused imports

---
 app/http/controllers/ConfirmController.py     |  1 -
 src/masonite/drivers/mail/BaseMailDriver.py   |  1 -
 src/masonite/drivers/mail/MailLogDriver.py    |  1 -
 .../drivers/queue/QueueDatabaseDriver.py      |  1 -
 src/masonite/providers/QueueProvider.py       |  1 -
 .../auth/controllers/RegisterController.py    |  2 +-
 src/masonite/testing/TestCase.py              |  1 -
 src/masonite/testsuite/TestSuite.py           |  9 ++++-----
 tests/core/test_auth.py                       |  2 +-
 tests/core/test_cache.py                      |  3 +--
 tests/core/test_mail_log_drivers.py           | 14 ++++++--------
 tests/core/test_mail_smtp_driver.py           |  1 -
 tests/core/test_managers_mail_manager.py      |  1 -
 tests/core/test_providers.py                  |  6 +++---
 tests/core/test_requests.py                   |  8 ++++----
 tests/core/test_response.py                   | 18 ++++++------------
 tests/core/test_session.py                    |  4 ++--
 tests/core/test_testsuite.py                  | 19 -------------------
 tests/core/test_upload_manager.py             |  1 -
 tests/core/test_view.py                       |  1 -
 tests/queues/test_drivers.py                  |  1 -
 wsgi.py                                       |  2 --
 22 files changed, 28 insertions(+), 70 deletions(-)
 delete mode 100644 tests/core/test_testsuite.py

diff --git a/app/http/controllers/ConfirmController.py b/app/http/controllers/ConfirmController.py
index 809786fe8..4328db0d9 100644
--- a/app/http/controllers/ConfirmController.py
+++ b/app/http/controllers/ConfirmController.py
@@ -7,7 +7,6 @@
 from src.masonite.request import Request
 from src.masonite.view import View
 from src.masonite.helpers import config
-from app.User import User
 
 
 class ConfirmController:
diff --git a/src/masonite/drivers/mail/BaseMailDriver.py b/src/masonite/drivers/mail/BaseMailDriver.py
index cbd76ee36..d4350966e 100644
--- a/src/masonite/drivers/mail/BaseMailDriver.py
+++ b/src/masonite/drivers/mail/BaseMailDriver.py
@@ -5,7 +5,6 @@
 from ...app import App
 from ...helpers import config
 from ...response import Responsable
-from ...view import View
 from .. import BaseDriver
 
 
diff --git a/src/masonite/drivers/mail/MailLogDriver.py b/src/masonite/drivers/mail/MailLogDriver.py
index 09a0988b7..781e4576d 100644
--- a/src/masonite/drivers/mail/MailLogDriver.py
+++ b/src/masonite/drivers/mail/MailLogDriver.py
@@ -6,7 +6,6 @@
 from ...app import App
 from ...contracts import MailContract
 from ...drivers import BaseMailDriver
-from ...view import View
 
 
 class MailLogDriver(BaseMailDriver, MailContract):
diff --git a/src/masonite/drivers/queue/QueueDatabaseDriver.py b/src/masonite/drivers/queue/QueueDatabaseDriver.py
index fd6602636..fa09e842d 100644
--- a/src/masonite/drivers/queue/QueueDatabaseDriver.py
+++ b/src/masonite/drivers/queue/QueueDatabaseDriver.py
@@ -34,7 +34,6 @@ def push(self, *objects, args=(), kwargs={}, **options):
         """
 
         from config.database import DB as schema
-        from config import queue
 
         callback = options.get('callback', 'handle')
         wait = options.get('wait', None)
diff --git a/src/masonite/providers/QueueProvider.py b/src/masonite/providers/QueueProvider.py
index 367547652..5f5466bbb 100644
--- a/src/masonite/providers/QueueProvider.py
+++ b/src/masonite/providers/QueueProvider.py
@@ -13,7 +13,6 @@ class QueueProvider(ServiceProvider):
     wsgi = False
 
     def register(self):
-        from config import queue
         self.app.bind('QueueAsyncDriver', QueueAsyncDriver)
         self.app.bind('QueueAmqpDriver', QueueAmqpDriver)
         self.app.bind('QueueManager', QueueManager)
diff --git a/src/masonite/snippets/auth/controllers/RegisterController.py b/src/masonite/snippets/auth/controllers/RegisterController.py
index 2f4b12624..5b256070c 100644
--- a/src/masonite/snippets/auth/controllers/RegisterController.py
+++ b/src/masonite/snippets/auth/controllers/RegisterController.py
@@ -1,6 +1,6 @@
 """The RegisterController Module."""
 
-from config import application, auth as auth_config
+from config import application
 from masonite.auth import Auth
 from masonite.request import Request
 from masonite.view import View
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index 58c260fa2..89bd567f1 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -279,7 +279,6 @@ def withoutHttpMiddleware(self):
 
     def create_container(self):
         container = App()
-        from config import application
         from config import providers
 
         container.bind('WSGI', generate_wsgi())
diff --git a/src/masonite/testsuite/TestSuite.py b/src/masonite/testsuite/TestSuite.py
index 108cc9da3..a9bc3a4ac 100644
--- a/src/masonite/testsuite/TestSuite.py
+++ b/src/masonite/testsuite/TestSuite.py
@@ -1,9 +1,8 @@
+import io
+
 from ..app import App
-from .TestRoute import TestRoute
 from .TestRequest import TestRequest
-from ..helpers import config
-
-import io
+from .TestRoute import TestRoute
 
 
 def generate_wsgi():
@@ -39,7 +38,7 @@ def generate_wsgi():
 class TestSuite:
 
     def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
-        from config import application, providers
+        from config import providers
         if not container:
             container = App(remember=False)
 
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 8d956163f..3731f7f9e 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -1,7 +1,7 @@
 import datetime
 import time
 
-from config import application, auth
+from config import application
 from config.database import Model
 from src.masonite.app import App
 from src.masonite.auth import Auth, MustVerifyEmail, Sign
diff --git a/tests/core/test_cache.py b/tests/core/test_cache.py
index 192eebdac..b5924dde3 100644
--- a/tests/core/test_cache.py
+++ b/tests/core/test_cache.py
@@ -1,13 +1,12 @@
 import glob
 import os
 import time
+import unittest
 
-from config import cache
 from src.masonite.app import App
 from src.masonite.drivers import CacheDiskDriver, CacheRedisDriver
 from src.masonite.environment import LoadEnvironment
 from src.masonite.managers import CacheManager
-import unittest
 
 LoadEnvironment()
 
diff --git a/tests/core/test_mail_log_drivers.py b/tests/core/test_mail_log_drivers.py
index fbf5f0a10..e65a3274d 100644
--- a/tests/core/test_mail_log_drivers.py
+++ b/tests/core/test_mail_log_drivers.py
@@ -1,16 +1,14 @@
-from config import mail
 
 import os
-
-from src.masonite.app import App
-from src.masonite.view import View
-from src.masonite.managers.MailManager import MailManager
-from src.masonite.drivers import MailLogDriver
-from src.masonite.drivers import MailTerminalDriver
-import unittest
 import sys
+import unittest
 from contextlib import contextmanager
+
 from _io import StringIO
+from src.masonite.app import App
+from src.masonite.drivers import MailLogDriver, MailTerminalDriver
+from src.masonite.managers.MailManager import MailManager
+from src.masonite.view import View
 
 
 @contextmanager
diff --git a/tests/core/test_mail_smtp_driver.py b/tests/core/test_mail_smtp_driver.py
index 6badae281..e3027d6a7 100644
--- a/tests/core/test_mail_smtp_driver.py
+++ b/tests/core/test_mail_smtp_driver.py
@@ -1,4 +1,3 @@
-from config import mail
 from src.masonite import env
 from src.masonite.app import App
 from src.masonite.drivers import MailMailgunDriver as Mailgun
diff --git a/tests/core/test_managers_mail_manager.py b/tests/core/test_managers_mail_manager.py
index 151d64954..fbfc5a3b1 100644
--- a/tests/core/test_managers_mail_manager.py
+++ b/tests/core/test_managers_mail_manager.py
@@ -2,7 +2,6 @@
 
 LoadEnvironment()
 
-from config import mail
 from src.masonite.app import App
 from src.masonite.contracts import MailManagerContract
 from src.masonite.drivers import MailMailgunDriver as Mailgun
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index 3ae460fae..c42ef392b 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -1,10 +1,10 @@
-from config import application, providers
+
+import unittest
 
 from src.masonite.app import App
+from src.masonite.helpers import config
 from src.masonite.routes import Get
 from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
-import unittest
-from src.masonite.helpers import config
 
 
 class TestProviders(unittest.TestCase):
diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py
index b436bbaf5..19e9a4a30 100644
--- a/tests/core/test_requests.py
+++ b/tests/core/test_requests.py
@@ -2,17 +2,17 @@
 from cgi import MiniFieldStorage
 
 import pytest
+
+from app.http.test_controllers.TestController import TestController
 from src.masonite.app import App
 from src.masonite.exceptions import InvalidHTTPStatusCode, RouteException
+from src.masonite.helpers import config
 from src.masonite.helpers.routes import flatten_routes
 from src.masonite.helpers.time import cookie_expire_time
 from src.masonite.request import Request
 from src.masonite.response import Response
 from src.masonite.routes import Get, RouteGroup
 from src.masonite.testsuite.TestSuite import generate_wsgi
-from src.masonite.helpers import config
-from app.http.test_controllers.TestController import TestController
-from config import application, providers
 
 WEB_ROUTES = flatten_routes([
     Get('/test', 'Controller@show').name('test'),
@@ -88,7 +88,7 @@ def test_request_input_can_get_dictionary_elements(self):
                 ]
             }
         }
-        self.assertEqual(self.request.input('user.address.*.id'), [1,2])
+        self.assertEqual(self.request.input('user.address.*.id'), [1, 2])
         self.assertEqual(self.request.input('user.address.*.street'), ['A Street', 'B Street'])
 
     def test_request_sets_and_gets_cookies(self):
diff --git a/tests/core/test_response.py b/tests/core/test_response.py
index 052617d7b..5e3e9975f 100644
--- a/tests/core/test_response.py
+++ b/tests/core/test_response.py
@@ -1,21 +1,15 @@
-import unittest
-import json
 
-from orator import Model
+from orator import LengthAwarePaginator, Model, Paginator
 from orator.support.collection import Collection
-from orator import Paginator, LengthAwarePaginator
-from app.User import User
+
 from app.http.controllers.TestController import \
     TestController as ControllerTest
-from src.masonite.app import App
-from src.masonite.request import Request
+from app.User import User
+from config.factories import factory
 from src.masonite.response import Response
-from src.masonite.testsuite import generate_wsgi
-from src.masonite.view import View
-from src.masonite.testing import TestCase
 from src.masonite.routes import Get
-from config.factories import factory
-
+from src.masonite.testing import TestCase
+from src.masonite.view import View
 
 
 class MockUser(Model):
diff --git a/tests/core/test_session.py b/tests/core/test_session.py
index 197966cf8..9b98e8cdb 100644
--- a/tests/core/test_session.py
+++ b/tests/core/test_session.py
@@ -1,10 +1,10 @@
-from config import session
+import unittest
+
 from src.masonite.app import App
 from src.masonite.drivers import SessionCookieDriver, SessionMemoryDriver
 from src.masonite.managers import SessionManager
 from src.masonite.request import Request
 from src.masonite.testsuite.TestSuite import generate_wsgi
-import unittest
 
 
 class TestSession(unittest.TestCase):
diff --git a/tests/core/test_testsuite.py b/tests/core/test_testsuite.py
deleted file mode 100644
index 04e75396d..000000000
--- a/tests/core/test_testsuite.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from src.masonite.testsuite.TestSuite import TestSuite
-import unittest
-
-
-# class TestTestSuite(unittest.TestCase):
-
-#     def setUp(self):
-#         self.suite = TestSuite().create_container()
-#         self.container = self.suite.get_container()
-
-#     def test_testsuite_creates_container(self):
-#         self.assertTrue(self.container.make('Request'))
-
-#     def test_testsuite_should_return_route_exists(self):
-#         self.assertTrue(self.suite.route('/test').exists())
-
-#     def test_testsuite_route_should_return_bool_if_has_middleware(self):
-#         self.assertTrue(self.suite.route('/test').hasMiddleware('auth'))
-#         self.assertFalse(self.suite.route('/test').hasMiddleware('none'))
diff --git a/tests/core/test_upload_manager.py b/tests/core/test_upload_manager.py
index aaf165ed1..35f7340a2 100644
--- a/tests/core/test_upload_manager.py
+++ b/tests/core/test_upload_manager.py
@@ -2,7 +2,6 @@
 import shutil
 import unittest
 
-from config import application, storage
 from src.masonite.app import App
 from src.masonite.drivers import UploadDiskDriver, UploadS3Driver
 from src.masonite.environment import LoadEnvironment
diff --git a/tests/core/test_view.py b/tests/core/test_view.py
index fbdff44f6..27dedd4e8 100644
--- a/tests/core/test_view.py
+++ b/tests/core/test_view.py
@@ -3,7 +3,6 @@
 
 from jinja2 import FileSystemLoader
 
-from config import cache
 from src.masonite.app import App
 from src.masonite.drivers import CacheDiskDriver
 from src.masonite.exceptions import RequiredContainerBindingNotFound, ViewException
diff --git a/tests/queues/test_drivers.py b/tests/queues/test_drivers.py
index b581e94f4..e1dcaa7a6 100644
--- a/tests/queues/test_drivers.py
+++ b/tests/queues/test_drivers.py
@@ -7,7 +7,6 @@
 from src.masonite.managers import QueueManager
 from src.masonite.queues.Queueable import Queueable
 from src.masonite.helpers import config
-from config import queue
 
 LoadEnvironment()
 
diff --git a/wsgi.py b/wsgi.py
index 22ae98924..3f5c3fbb8 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -3,7 +3,6 @@
 from src.masonite.app import App
 
 from bootstrap.start import app
-from config import application, providers
 from src.masonite.helpers import config
 
 """Instantiate Container And Perform Important Bindings
@@ -16,7 +15,6 @@
 container.bind('WSGI', app)
 container.bind('Container', container)
 
-# container.bind('ProvidersConfig', providers)
 container.bind('Providers', [])
 container.bind('WSGIProviders', [])
 

From 9555e697e184e2536b458d1b4bf8e2b8b9729717 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 16:28:34 -0400
Subject: [PATCH 31/59] cleaned up deepsource issues

---
 .../drivers/queue/QueueDatabaseDriver.py      |  1 -
 src/masonite/exception_handler.py             |  2 +-
 src/masonite/routes.py                        |  2 +-
 src/masonite/testing/MockController.py        |  4 ----
 src/masonite/testing/MockJson.py              | 24 -------------------
 src/masonite/testing/MockRequest.py           | 20 ----------------
 src/masonite/testing/__init__.py              |  4 ----
 tests/core/test_mailgun_driver.py             |  3 +--
 tests/core/test_response.py                   |  1 -
 9 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 src/masonite/testing/MockController.py
 delete mode 100644 src/masonite/testing/MockJson.py
 delete mode 100644 src/masonite/testing/MockRequest.py

diff --git a/src/masonite/drivers/queue/QueueDatabaseDriver.py b/src/masonite/drivers/queue/QueueDatabaseDriver.py
index fa09e842d..03b5cba93 100644
--- a/src/masonite/drivers/queue/QueueDatabaseDriver.py
+++ b/src/masonite/drivers/queue/QueueDatabaseDriver.py
@@ -59,7 +59,6 @@ def push(self, *objects, args=(), kwargs={}, **options):
 
     def consume(self, channel, fair=False, **options):
         from config.database import DB as schema, DATABASES
-        from config import queue
         from wsgi import container
 
         if not channel or channel == 'default':
diff --git a/src/masonite/exception_handler.py b/src/masonite/exception_handler.py
index 4bd2beaf8..506ea2ea5 100644
--- a/src/masonite/exception_handler.py
+++ b/src/masonite/exception_handler.py
@@ -61,7 +61,7 @@ def load_exception(self, exception):
         self.handle(exception)
 
     def run_listeners(self, exception, stacktraceback):
-        for key, exception_class in self._app.collect(BaseExceptionListener).items():
+        for exception_class in self._app.collect(BaseExceptionListener):
             if '*' in exception_class.listens or exception.__class__ in exception_class.listens:
                 file, line = self.get_file_and_line(stacktraceback)
                 self._app.resolve(exception_class).handle(exception, file, line)
diff --git a/src/masonite/routes.py b/src/masonite/routes.py
index 640c75f03..0c4a8a17f 100644
--- a/src/masonite/routes.py
+++ b/src/masonite/routes.py
@@ -211,7 +211,7 @@ def _find_controller(self, controller):
         except ImportError as e:
             import sys
             import traceback
-            exc_type, _, exc_tb = sys.exc_info()
+            _, _, exc_tb = sys.exc_info()
             tb = traceback.extract_tb(exc_tb)[-1]
             print('\033[93mCannot find controller {}. Did you create this one? Raised: {} in {} on line {}'.format(
                 get_controller, str(e), tb[0], tb[1]), '\033[0m')
diff --git a/src/masonite/testing/MockController.py b/src/masonite/testing/MockController.py
deleted file mode 100644
index ba955b132..000000000
--- a/src/masonite/testing/MockController.py
+++ /dev/null
@@ -1,4 +0,0 @@
-class MockController:
-
-    def returns_instance_of(self, obj):
-        pass
diff --git a/src/masonite/testing/MockJson.py b/src/masonite/testing/MockJson.py
deleted file mode 100644
index 74fa84d7a..000000000
--- a/src/masonite/testing/MockJson.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from ..testsuite import TestSuite, generate_wsgi
-from ..testing import BaseRequest
-
-
-class MockJson(BaseRequest):
-
-    def __init__(self, url, container):
-        self.url = url
-        self.container = container
-
-    def json(self, request_method, url, data):
-        wsgi = generate_wsgi()
-        wsgi['PATH_INFO'] = url
-        wsgi['CONTENT_TYPE'] = 'application/json'
-
-    def contains(self, value):
-        return value in self.container.make('Response')
-
-    def _run_container(self, wsgi):
-        return TestSuite().create_container(wsgi, container=self.container)
-
-    def _bind_user_to_request(self, request, container):
-        request.set_user(self._user)
-        return self
diff --git a/src/masonite/testing/MockRequest.py b/src/masonite/testing/MockRequest.py
deleted file mode 100644
index 720c21dd4..000000000
--- a/src/masonite/testing/MockRequest.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from ..testsuite import TestSuite
-from ..testing import BaseRequest
-
-
-class MockRequest(BaseRequest):
-
-    def __init__(self, url, container):
-        self.url = url
-        self.container = container
-
-    def _run_container(self, wsgi):
-        return TestSuite().create_container(wsgi, container=self.container)
-
-    def _bind_user_to_request(self, request, container):
-        request.set_user(self._user)
-        return self
-
-    def contains(self, value):
-        print('response:', self.container.make('Response'))
-        return value in self.container.make('Response')
diff --git a/src/masonite/testing/__init__.py b/src/masonite/testing/__init__.py
index 929db5f82..deca49fab 100644
--- a/src/masonite/testing/__init__.py
+++ b/src/masonite/testing/__init__.py
@@ -1,6 +1,2 @@
-from .BaseRequest import BaseRequest
 from .TestCase import TestCase
-from .MockJson import MockJson
-from .MockRequest import MockRequest
 from .MockRoute import MockRoute
-from .MockController import MockController
diff --git a/tests/core/test_mailgun_driver.py b/tests/core/test_mailgun_driver.py
index 2dab2d5eb..821e43dfd 100644
--- a/tests/core/test_mailgun_driver.py
+++ b/tests/core/test_mailgun_driver.py
@@ -1,6 +1,6 @@
 import os
+import unittest
 
-from config import mail
 from src.masonite import env
 from src.masonite.app import App
 from src.masonite.drivers import MailMailgunDriver as Mailgun
@@ -8,7 +8,6 @@
 from src.masonite.environment import LoadEnvironment
 from src.masonite.managers.MailManager import MailManager
 from src.masonite.view import View
-import unittest
 
 LoadEnvironment()
 
diff --git a/tests/core/test_response.py b/tests/core/test_response.py
index 5e3e9975f..7dbda8927 100644
--- a/tests/core/test_response.py
+++ b/tests/core/test_response.py
@@ -174,7 +174,6 @@ def test_view_should_return_a_json_response_when_returning_length_aware_paginato
 
     def test_view_should_return_a_json_response_when_returning_paginator_instance(self):
         
-        users = User.all()
         (
             self.get('/paginator')
                 .assertHasJson('count', 10)

From 52c774f43e4b4b15f942b5fbf93cb9a7eae68600 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 19:47:10 -0400
Subject: [PATCH 32/59] convert to string before bytes

---
 masonite/auth/Sign.py | 68 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 masonite/auth/Sign.py

diff --git a/masonite/auth/Sign.py b/masonite/auth/Sign.py
new file mode 100644
index 000000000..973d75396
--- /dev/null
+++ b/masonite/auth/Sign.py
@@ -0,0 +1,68 @@
+"""Cryptographic Signing Module."""
+import binascii
+
+from cryptography.fernet import Fernet
+
+from masonite.exceptions import InvalidSecretKey
+
+
+class Sign:
+    """Cryptographic signing class."""
+
+    def __init__(self, key=None):
+        """Sign constructor.
+
+        Keyword Arguments:
+            key {string} -- The secret key to use. If nothing is passed it then it will use
+                            the secret key from the config file. (default: {None})
+
+        Raises:
+            InvalidSecretKey -- Thrown if the secret key does not exist.
+        """
+        if key:
+            self.key = key
+        else:
+            from config import application
+            self.key = application.KEY
+
+        if not self.key:
+            raise InvalidSecretKey(
+                "The encryption key passed in is: None. Be sure there is a secret key present in your .env file or your config/application.py file.")
+
+        self.encryption = None
+
+    def sign(self, value):
+        """Sign a value using the secret key.
+
+        Arguments:
+            value {string} -- The value to be encrypted.
+
+        Returns:
+            string -- Returns the encrypted value.
+
+        Raises:
+            InvalidSecretKey -- Thrown if the secret key has incorrect padding.
+        """
+        try:
+            f = Fernet(self.key)
+        except (binascii.Error, ValueError):
+            raise InvalidSecretKey(
+                "You have passed an invalid secret key of: {}. Make sure you have correctly added your secret key.".format(self.key))
+
+        self.encryption = f.encrypt(bytes(str(value), 'utf-8'))
+        return self.encryption.decode('utf-8')
+
+    def unsign(self, value=None):
+        """Unsign the value using the secret key.
+
+        Keyword Arguments:
+            value {string} -- The value to be unencrypted. (default: {None})
+
+        Returns:
+            string -- Returns the unencrypted value.
+        """
+        f = Fernet(self.key)
+
+        if not value:
+            return f.decrypt(self.encryption).decode('utf-8')
+        return f.decrypt(bytes(value, 'utf-8')).decode('utf-8')

From b3d13593f06e29211f5006896430c411faf1e66f Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 19:51:56 -0400
Subject: [PATCH 33/59] bumped to 2.3 version

---
 src/masonite/__version__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masonite/__version__.py b/src/masonite/__version__.py
index c2dd1113e..52cba933d 100644
--- a/src/masonite/__version__.py
+++ b/src/masonite/__version__.py
@@ -2,7 +2,7 @@
 __title__ = 'masonite'
 __description__ = 'The core for the Masonite framework'
 __url__ = 'https://github.com/MasoniteFramework/masonite'
-__version__ = '2.2.24'
+__version__ = '2.3.0b1'
 __author__ = 'Joseph Mancuso'
 __author_email__ = 'joe@masoniteproject.com'
 __licence__ = 'MIT'

From 08155a46619971c96a537d27ed8f78668af50f1e Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 19:53:40 -0400
Subject: [PATCH 34/59] added str to byets

---
 src/masonite/auth/Sign.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/masonite/auth/Sign.py b/src/masonite/auth/Sign.py
index 62ce69572..b15f7da77 100644
--- a/src/masonite/auth/Sign.py
+++ b/src/masonite/auth/Sign.py
@@ -49,7 +49,7 @@ def sign(self, value):
             raise InvalidSecretKey(
                 "You have passed an invalid secret key of: {}. Make sure you have correctly added your secret key.".format(self.key))
 
-        self.encryption = f.encrypt(bytes(value, 'utf-8'))
+        self.encryption = f.encrypt(bytes(str(value), 'utf-8'))
         return self.encryption.decode('utf-8')
 
     def unsign(self, value=None):
@@ -65,4 +65,4 @@ def unsign(self, value=None):
 
         if not value:
             return f.decrypt(self.encryption).decode('utf-8')
-        return f.decrypt(bytes(value, 'utf-8')).decode('utf-8')
+        return f.decrypt(bytes(str(value), 'utf-8')).decode('utf-8')

From 7f41d8740d2e869823ad8f11485ccee21ef53fee Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 20:21:52 -0400
Subject: [PATCH 35/59] fixed manifest file

---
 MANIFEST.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 215c8789d..53600b6e4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
-include masonite/snippets/exceptions/css/*
-include masonite/snippets/exceptions/*
-include masonite/snippets/*
-include masonite/snippets/migrations/*
-include masonite/snippets/scaffold/*
-include masonite/snippets/auth/controllers/*
-include masonite/snippets/auth/templates/auth/*
\ No newline at end of file
+include src/masonite/snippets/exceptions/css/*
+include src/masonite/snippets/exceptions/*
+include src/masonite/snippets/*
+include src/masonite/snippets/migrations/*
+include src/masonite/snippets/scaffold/*
+include src/masonite/snippets/auth/controllers/*
+include src/masonite/snippets/auth/templates/auth/*
\ No newline at end of file

From f28dddb0d7d8b81d1d0031ff30871587cee1738e Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 20:35:59 -0400
Subject: [PATCH 36/59] bumped validation version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 656e81db6..bf593190d 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
         'Jinja2>=2,<3',
         'masonite-events>=1.0,<2',
         'masonite-scheduler>=1.0.0,<=1.0.99',
-        'masonite-validation>=2.2.0,<=2.2.99',
+        'masonite-validation>=3.0.0,<4.0.0',
         'orator>=0.9,<1',
         'passlib>=1.7,<1.8',
         'pendulum>=1.5,<1.6',

From 5c88b8c2e009abd148b7a6e2170dee876a75f86b Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 21:03:07 -0400
Subject: [PATCH 37/59] removed requirements

---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index bf593190d..6a17732ba 100644
--- a/setup.py
+++ b/setup.py
@@ -44,9 +44,9 @@
         'cryptography>=2.3,<2.8',
         'hupper>=1.0,<2.0',
         'Jinja2>=2,<3',
-        'masonite-events>=1.0,<2',
-        'masonite-scheduler>=1.0.0,<=1.0.99',
-        'masonite-validation>=3.0.0,<4.0.0',
+        # 'masonite-events>=1.0,<2',
+        # 'masonite-scheduler>=1.0.0,<=1.0.99',
+        # 'masonite-validation>=3.0.0,<4.0.0',
         'orator>=0.9,<1',
         'passlib>=1.7,<1.8',
         'pendulum>=1.5,<1.6',
@@ -66,7 +66,7 @@
     url=meta['__url__'],
     keywords=['masonite', 'python web framework', 'python3'],
     licence=meta['__licence__'],
-    python_requires=">=3.4",
+    python_requires=">=3.5",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',

From 47d5ca5771be4b5127557466d096fac526a44421 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 21:12:21 -0400
Subject: [PATCH 38/59] fixed classifier

---
 setup.py                    | 2 +-
 src/masonite/__version__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 6a17732ba..c149ce75b 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
     licence=meta['__licence__'],
     python_requires=">=3.5",
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Masonite',
         'Intended Audience :: Developers',
diff --git a/src/masonite/__version__.py b/src/masonite/__version__.py
index 52cba933d..824e3b6fa 100644
--- a/src/masonite/__version__.py
+++ b/src/masonite/__version__.py
@@ -2,7 +2,7 @@
 __title__ = 'masonite'
 __description__ = 'The core for the Masonite framework'
 __url__ = 'https://github.com/MasoniteFramework/masonite'
-__version__ = '2.3.0b1'
+__version__ = '2.3.0b1.post1'
 __author__ = 'Joseph Mancuso'
 __author_email__ = 'joe@masoniteproject.com'
 __licence__ = 'MIT'

From dea5fcd9a695a737f46b4c9db9b6381d04285dfd Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sun, 27 Oct 2019 21:31:43 -0400
Subject: [PATCH 39/59] fixed readme issues

---
 setup.py                    | 9 ++++++---
 src/masonite/__version__.py | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index c149ce75b..dd3594d89 100644
--- a/setup.py
+++ b/setup.py
@@ -7,9 +7,12 @@
 with open(os.path.join(here, 'src/masonite', '__version__.py'), 'r') as f:
     exec(f.read(), meta)
 
-with open('README.md', 'r') as f:
-    readme = f.read()
-
+try:
+    with open('README.md', 'r') as f:
+        readme = f.read()
+except FileNotFoundError:
+    readme = ""
+    
 setup(
     name=meta['__title__'],
     packages=[
diff --git a/src/masonite/__version__.py b/src/masonite/__version__.py
index 824e3b6fa..5fcaadf73 100644
--- a/src/masonite/__version__.py
+++ b/src/masonite/__version__.py
@@ -2,7 +2,7 @@
 __title__ = 'masonite'
 __description__ = 'The core for the Masonite framework'
 __url__ = 'https://github.com/MasoniteFramework/masonite'
-__version__ = '2.3.0b1.post1'
+__version__ = '2.3.0b1.post2'
 __author__ = 'Joseph Mancuso'
 __author_email__ = 'joe@masoniteproject.com'
 __licence__ = 'MIT'

From 4619b2ac281f6846509be7e7379cf8b720e50c3c Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Tue, 29 Oct 2019 23:11:36 -0400
Subject: [PATCH 40/59] modifying tests

---
 tests/core/test_auth.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 3731f7f9e..c7ffbba6e 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -5,6 +5,7 @@
 from config.database import Model
 from src.masonite.app import App
 from src.masonite.auth import Auth, MustVerifyEmail, Sign
+from src.masonite.auth.guards import Guard
 from src.masonite.managers import AuthManager
 from src.masonite.drivers import AuthCookieDriver, AuthJwtDriver
 from src.masonite.helpers import password as bcrypt_password
@@ -33,7 +34,7 @@ def setUp(self):
         self.app = self.container
         self.app.bind('Container', self.app)
         view = View(self.container)
-        self.request = Request(generate_wsgi())
+        self.request = Request(generate_wsgi()).load_environ(generate_wsgi())
         self.request.key(application.KEY)
         self.app.bind('Request', self.request)
         # self.auth = Auth(self.request, MockUser())
@@ -44,7 +45,9 @@ def setUp(self):
         self.app.bind('AuthCookieDriver', AuthCookieDriver)
         self.app.bind('AuthJwtDriver', AuthJwtDriver)
 
-        self.auth = self.app.make('Auth', User)
+        # print(Guard('web').driver('cookie'))
+
+        self.auth = Guard(self.app, 'web')
         self.request.load_app(self.app)
 
     def setUpFactories(self):
@@ -58,7 +61,7 @@ def setUpFactories(self):
     def test_auth(self):
         self.assertTrue(self.auth)
 
-    def test_login_user(self):
+    def test_login_user1(self):
         for driver in ('cookie', 'jwt'):
             self.auth.driver = driver
             self.assertTrue(self.auth.login('user@email.com', 'secret'))
@@ -68,7 +71,7 @@ def test_login_user(self):
     def test_login_with_no_password(self):
         with self.assertRaises(TypeError):
             for driver in ('cookie', 'jwt'):
-                self.auth.driver = driver
+                # self.auth.driver = driver
                 self.assertTrue(self.auth.login('nopassword@email.com', None))
 
     # def test_can_login_with_second_password(self):

From b78cdccf4cb27e3ddb449fe5152ec3c1fe4b5e15 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 00:30:12 -0400
Subject: [PATCH 41/59] improved authentication system with guards

---
 config/auth.py                                |  25 ++-
 masonite/auth/Sign.py                         |  68 --------
 src/masonite/auth/Auth.py                     | 159 +----------------
 src/masonite/auth/guards/APIGuard.py          |   0
 src/masonite/auth/guards/Guard.py             |  39 +++++
 src/masonite/auth/guards/WebGuard.py          | 164 ++++++++++++++++++
 src/masonite/auth/guards/__init__.py          |   2 +
 .../authentication/AuthCookieDriver.py        |   9 +
 .../drivers/authentication/AuthJwtDriver.py   |   6 +-
 src/masonite/helpers/structures.py            |   2 +-
 tests/core/test_auth.py                       |  48 ++---
 11 files changed, 257 insertions(+), 265 deletions(-)
 delete mode 100644 masonite/auth/Sign.py
 create mode 100644 src/masonite/auth/guards/APIGuard.py
 create mode 100644 src/masonite/auth/guards/Guard.py
 create mode 100644 src/masonite/auth/guards/WebGuard.py
 create mode 100644 src/masonite/auth/guards/__init__.py

diff --git a/config/auth.py b/config/auth.py
index 93afc2b50..ee2cb5adc 100644
--- a/config/auth.py
+++ b/config/auth.py
@@ -17,16 +17,23 @@
 """
 
 AUTH = {
-    'driver': env('AUTH_DRIVER', 'cookie'),
-    'model': User,
+    'defaults': {
+        'guard': 'web'
+    },
+    'guards': {
+        'web': {
+            'driver': 'cookie',
+            'model': User,
+            'drivers': { # 'cookie', 'jwt'
+                'jwt': {
+                    'reauthentication': True,
+                    'lifetime': '5 minutes'
+                }
+            }
+        },
+    }
 }
 
 DRIVERS = {
-    'jwt': {
-        """Whether or not to reauthenticate with the database when the token expires."""
-        'reauthentication': True,
-
-        """How long the token should live for before being refreshed."""
-        'lifetime': '5 minutes'
-    }
+    
 }
diff --git a/masonite/auth/Sign.py b/masonite/auth/Sign.py
deleted file mode 100644
index 973d75396..000000000
--- a/masonite/auth/Sign.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""Cryptographic Signing Module."""
-import binascii
-
-from cryptography.fernet import Fernet
-
-from masonite.exceptions import InvalidSecretKey
-
-
-class Sign:
-    """Cryptographic signing class."""
-
-    def __init__(self, key=None):
-        """Sign constructor.
-
-        Keyword Arguments:
-            key {string} -- The secret key to use. If nothing is passed it then it will use
-                            the secret key from the config file. (default: {None})
-
-        Raises:
-            InvalidSecretKey -- Thrown if the secret key does not exist.
-        """
-        if key:
-            self.key = key
-        else:
-            from config import application
-            self.key = application.KEY
-
-        if not self.key:
-            raise InvalidSecretKey(
-                "The encryption key passed in is: None. Be sure there is a secret key present in your .env file or your config/application.py file.")
-
-        self.encryption = None
-
-    def sign(self, value):
-        """Sign a value using the secret key.
-
-        Arguments:
-            value {string} -- The value to be encrypted.
-
-        Returns:
-            string -- Returns the encrypted value.
-
-        Raises:
-            InvalidSecretKey -- Thrown if the secret key has incorrect padding.
-        """
-        try:
-            f = Fernet(self.key)
-        except (binascii.Error, ValueError):
-            raise InvalidSecretKey(
-                "You have passed an invalid secret key of: {}. Make sure you have correctly added your secret key.".format(self.key))
-
-        self.encryption = f.encrypt(bytes(str(value), 'utf-8'))
-        return self.encryption.decode('utf-8')
-
-    def unsign(self, value=None):
-        """Unsign the value using the secret key.
-
-        Keyword Arguments:
-            value {string} -- The value to be unencrypted. (default: {None})
-
-        Returns:
-            string -- Returns the unencrypted value.
-        """
-        f = Fernet(self.key)
-
-        if not value:
-            return f.decrypt(self.encryption).decode('utf-8')
-        return f.decrypt(bytes(value, 'utf-8')).decode('utf-8')
diff --git a/src/masonite/auth/Auth.py b/src/masonite/auth/Auth.py
index 7e497e313..35f610bee 100644
--- a/src/masonite/auth/Auth.py
+++ b/src/masonite/auth/Auth.py
@@ -1,160 +1,5 @@
 """Authentication Class."""
 
-import uuid
-
-import bcrypt
-
-from ..helpers import password as bcrypt_password, config
-from ..app import App
-
-
 class Auth:
-    """This class will be used to authenticate users based on the config/auth.py file."""
-
-    _once = False
-
-    def __init__(self, app: App, auth_model=None):
-        """Auth constructor.
-
-        Arguments:
-            request {masonite.request.Request} -- The Request object.
-
-        Keyword Arguments:
-            auth_model {object} -- The model you want to authenticate with (default: {None})
-        """
-        self.request = app.make('Request')
-
-        if auth_model:
-            self.auth_model = auth_model
-        else:
-            from config import auth
-            self.auth_model = auth.AUTH['model']
-
-        self.driver = config('auth.auth.driver', 'cookie')
-
-    def user(self):
-        """Get the currently logged in user.
-
-        Raises:
-            exception -- Raised when there has been an error handling the user model.
-
-        Returns:
-            object|bool -- Returns the current authenticated user object or False or None if there is none.
-        """
-        try:
-            return self.request.app().make('AuthManager').driver(self.driver).user(self.auth_model)
-        except Exception as exception:
-            raise exception
-
-        return None
-
-    def login(self, name, password):
-        """Login the user based on the parameters provided.
-
-        Arguments:
-            name {string} -- The field to authenticate. This could be a username or email address.
-            password {string} -- The password to authenticate with.
-
-        Raises:
-            exception -- Raised when there has been an error handling the user model.
-
-        Returns:
-            object|bool -- Returns the current authenticated user object or False or None if there is none.
-        """
-
-        if not isinstance(password, str):
-            raise TypeError("Cannot login with password '{}' of type: {}".format(password, type(password)))
-
-        auth_column = self.auth_model.__auth__
-
-        try:
-            # Try to login multiple or statements if given an auth list
-            if isinstance(auth_column, list):
-                model = self.auth_model.where(auth_column[0], name)
-
-                for authentication_column in auth_column[1:]:
-                    model.or_where(authentication_column, name)
-
-                model = model.first()
-            else:
-                model = self.auth_model.where(auth_column, name).first()
-
-            if model and bcrypt.checkpw(bytes(password, 'utf-8'), bytes(self._get_password_column(model), 'utf-8')):
-                if not self._once:
-                    remember_token = str(uuid.uuid4())
-                    model.remember_token = remember_token
-                    model.save()
-                    self.request.app().make('AuthManager').driver(self.driver).save(remember_token, model=model)
-                    
-                self.request.set_user(model)
-                return model
-
-        except Exception as exception:
-            raise exception
-
-        return False
-
-    def logout(self):
-        """Logout the current authenticated user.
-
-        Returns:
-            self
-        """
-        self.request.app().make('AuthManager').driver(self.driver).delete()
-        self.request.reset_user()
-        return self
-
-    def login_by_id(self, user_id):
-        """Login a user by the user ID.
-
-        Arguments:
-            user_id {string|int} -- The ID of the user model record.
-
-        Returns:
-            object|False -- Returns the current authenticated user object or False or None if there is none.
-        """
-        model = self.auth_model.find(user_id)
-
-        if model:
-            if not self._once:
-                remember_token = str(uuid.uuid4())
-                model.remember_token = remember_token
-                model.save()
-                self.request.app().make('AuthManager').driver(self.driver).save(remember_token, model=model)
-            self.request.set_user(model)
-            return model
-
-        return False
-
-    def once(self):
-        """Log in the user without saving a cookie.
-
-        Returns:
-            self
-        """
-        self._once = True
-        return self
-
-    def _get_password_column(self, model):
-        """Gets the password column to use.
-
-        Arguments:
-            model {orator.orm.Model} -- An Orator type model.
-
-        Returns:
-            string
-        """
-        if hasattr(model, '__password__'):
-            return getattr(model, model.__password__)
-
-        if hasattr(model, 'password'):
-            return getattr(model, 'password')
-
-    def register(self, user):
-        """Register the user.
-
-        Arguments:
-            user {dict} -- A dictionary of user data information.
-        """
-        user['password'] = bcrypt_password(user['password'])
-        self.auth_model.create(**user)
+    """Facade class for the Guard class"""
+    pass
diff --git a/src/masonite/auth/guards/APIGuard.py b/src/masonite/auth/guards/APIGuard.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/masonite/auth/guards/Guard.py b/src/masonite/auth/guards/Guard.py
new file mode 100644
index 000000000..c240ccff9
--- /dev/null
+++ b/src/masonite/auth/guards/Guard.py
@@ -0,0 +1,39 @@
+from .WebGuard import WebGuard
+from ...helpers import config
+from ...app import App
+
+class Guard:
+
+    guards = {
+        'web': WebGuard
+    }
+
+    def __init__(self, app: App, guard=None):
+        self.app = app
+        self._guard = self.make(guard or config('auth.auth.defaults.guard'))
+
+    def register(self, key, cls):
+        self.guards.update({key: cls})
+
+    def make(self, key):
+        if key in self.guards:
+            self._guard = self.app.resolve(self.guards[key])
+            return self._guard
+
+    def get(self):
+        return self._guard
+
+    def driver(self, key):
+        return self._guard.make(key)
+
+    def login(self, *args, **kwargs):
+        return self._guard.login(*args, **kwargs)
+    
+    def user(self, *args, **kwargs):
+        return self._guard.user(*args, **kwargs)
+    
+    def register(self, *args, **kwargs):
+        return self._guard.register(*args, **kwargs)
+    
+    def __getattr__(self, key, *args, **kwargs):
+        return getattr(self._guard, key)
diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
new file mode 100644
index 000000000..1bcbff87d
--- /dev/null
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -0,0 +1,164 @@
+import uuid
+
+import bcrypt
+
+from ...app import App
+from ...request import Request
+from ...drivers import AuthCookieDriver, AuthJwtDriver
+from ...helpers import config
+from ...helpers import password as bcrypt_password
+
+
+class WebGuard:
+
+    drivers = {
+        'cookie': AuthCookieDriver,
+        'jwt': AuthJwtDriver
+    }
+
+    def __init__(self, app: App, request: Request, driver=None, auth_model=None):
+        self.app = app
+        self.request = request
+        self._once = False
+        self.auth_model = auth_model or config('auth.auth.guards.web.model')
+        self.driver = self.make(driver or config('auth.auth.guards.web.driver'))
+
+    def guard(self, guard):
+        """Specify the guard you want to use
+        
+        Arguments:
+            guard {[type]} -- [description]
+        """
+        from .Guard import Guard
+        return Guard(self.app, guard).get()
+
+    def make(self, key):
+        if key in self.drivers:
+            self.driver = self.app.resolve(self.drivers[key])
+            return self.driver
+
+    def user(self):
+        """Get the currently logged in user.
+
+        Raises:
+            exception -- Raised when there has been an error handling the user model.
+
+        Returns:
+            object|bool -- Returns the current authenticated user object or False or None if there is none.
+        """
+        try:
+            return self.driver.user(self.auth_model)
+        except Exception as exception:
+            raise exception
+
+        return None
+
+    def login(self, name, password):
+        """Login the user based on the parameters provided.
+
+        Arguments:
+            name {string} -- The field to authenticate. This could be a username or email address.
+            password {string} -- The password to authenticate with.
+
+        Raises:
+            exception -- Raised when there has been an error handling the user model.
+
+        Returns:
+            object|bool -- Returns the current authenticated user object or False or None if there is none.
+        """
+
+        if not isinstance(password, str):
+            raise TypeError("Cannot login with password '{}' of type: {}".format(password, type(password)))
+
+        auth_column = self.auth_model.__auth__
+
+        try:
+            # Try to login multiple or statements if given an auth list
+            if isinstance(auth_column, list):
+                model = self.auth_model.where(auth_column[0], name)
+
+                for authentication_column in auth_column[1:]:
+                    model.or_where(authentication_column, name)
+
+                model = model.first()
+            else:
+                model = self.auth_model.where(auth_column, name).first()
+
+            if model and bcrypt.checkpw(bytes(password, 'utf-8'), bytes(self._get_password_column(model), 'utf-8')):
+                if not self._once:
+                    remember_token = str(uuid.uuid4())
+                    model.remember_token = remember_token
+                    model.save()
+                    self.driver.save(remember_token, model=model)
+
+                self.request.set_user(model)
+                return model
+
+        except Exception as exception:
+            raise exception
+
+        return False
+
+    def logout(self):
+        """Logout the current authenticated user.
+
+        Returns:
+            self
+        """
+        self.driver.logout()
+        return self
+
+    def login_by_id(self, user_id):
+        """Login a user by the user ID.
+
+        Arguments:
+            user_id {string|int} -- The ID of the user model record.
+
+        Returns:
+            object|False -- Returns the current authenticated user object or False or None if there is none.
+        """
+        model = self.auth_model.find(user_id)
+
+        if model:
+            if not self._once:
+                remember_token = str(uuid.uuid4())
+                model.remember_token = remember_token
+                model.save()
+                self.driver.save(remember_token, model=model)
+            self.request.set_user(model)
+            return model
+
+        return False
+
+    def once(self):
+        """Log in the user without saving a cookie.
+
+        Returns:
+            self
+        """
+        self._once = True
+        return self
+
+    def _get_password_column(self, model):
+        """Gets the password column to use.
+
+        Arguments:
+            model {orator.orm.Model} -- An Orator type model.
+
+        Returns:
+            string
+        """
+        if hasattr(model, '__password__'):
+            return getattr(model, model.__password__)
+
+        if hasattr(model, 'password'):
+            return getattr(model, 'password')
+
+    def register(self, user):
+        """Register the user.
+
+        Arguments:
+            user {dict} -- A dictionary of user data information.
+        """
+        user['password'] = bcrypt_password(user['password'])
+        self.auth_model.create(**user)
diff --git a/src/masonite/auth/guards/__init__.py b/src/masonite/auth/guards/__init__.py
new file mode 100644
index 000000000..b89a69741
--- /dev/null
+++ b/src/masonite/auth/guards/__init__.py
@@ -0,0 +1,2 @@
+from .Guard import Guard
+from .WebGuard import WebGuard
\ No newline at end of file
diff --git a/src/masonite/drivers/authentication/AuthCookieDriver.py b/src/masonite/drivers/authentication/AuthCookieDriver.py
index 43ffc929c..1ca61d1b2 100644
--- a/src/masonite/drivers/authentication/AuthCookieDriver.py
+++ b/src/masonite/drivers/authentication/AuthCookieDriver.py
@@ -51,3 +51,12 @@ def delete(self):
             bool
         """
         return self.request.delete_cookie('token')
+
+    def logout(self):
+        """Deletes the state depending on the implementation of this driver.
+
+        Returns:
+            bool
+        """
+        self.delete()
+        self.request.reset_user()
diff --git a/src/masonite/drivers/authentication/AuthJwtDriver.py b/src/masonite/drivers/authentication/AuthJwtDriver.py
index c9c17423b..ac410049e 100644
--- a/src/masonite/drivers/authentication/AuthJwtDriver.py
+++ b/src/masonite/drivers/authentication/AuthJwtDriver.py
@@ -64,7 +64,7 @@ def user(self, auth_model):
     def save(self, _, **kwargs):
         """Saves the state of authentication.
 
-        In this case the state is saving to a cookie.
+        In this case the state is serializing the user model and saving to a token cookie.
 
         Arguments:
             remember_token {string} -- A token containing the state.
@@ -89,3 +89,7 @@ def delete(self):
             bool
         """
         self.request.delete_cookie('token')
+
+    def logout(self):
+        self.delete()
+        self.request.reset_user()
\ No newline at end of file
diff --git a/src/masonite/helpers/structures.py b/src/masonite/helpers/structures.py
index b788ddf3f..6fb00b7ab 100644
--- a/src/masonite/helpers/structures.py
+++ b/src/masonite/helpers/structures.py
@@ -57,7 +57,7 @@ def dot(self, search, dictionary, default=None):
                 if isinstance(dic, str) and dic.isnumeric():
                     continue
 
-                if dic and not isinstance(dic, int) and len(dic) == 1 and not isinstance(dic[list(dic)[0]], dict):
+                if dic and not isinstance(dic, int) and hasattr(dic, '__len__') and len(dic) == 1 and not isinstance(dic[list(dic)[0]], dict):
                     possible = dic
 
             if not isinstance(dic, dict):
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 8e5476cc6..35c5ba547 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -5,7 +5,7 @@
 from config.database import Model
 from src.masonite.app import App
 from src.masonite.auth import Auth, MustVerifyEmail, Sign
-from src.masonite.auth.guards import Guard
+from src.masonite.auth.guards import Guard, WebGuard
 from src.masonite.managers import AuthManager
 from src.masonite.drivers import AuthCookieDriver, AuthJwtDriver
 from src.masonite.helpers import password as bcrypt_password
@@ -37,17 +37,12 @@ def setUp(self):
         self.request = Request(generate_wsgi()).load_environ(generate_wsgi())
         self.request.key(application.KEY)
         self.app.bind('Request', self.request)
-        # self.auth = Auth(self.request, MockUser())
         self.container.bind('View', view.render)
         self.container.bind('ViewClass', view)
-        self.app.bind('Auth', Auth)
-        self.app.bind('AuthManager', AuthManager)
-        self.app.bind('AuthCookieDriver', AuthCookieDriver)
-        self.app.bind('AuthJwtDriver', AuthJwtDriver)
 
-        # print(Guard('web').driver('cookie'))
 
         self.auth = Guard(self.app, 'web')
+        self.app.swap(Auth, self.auth)
         self.request.load_app(self.app)
 
     def setUpFactories(self):
@@ -63,7 +58,7 @@ def test_auth(self):
 
     def test_login_user1(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(self.auth.login('user@email.com', 'secret'))
             self.assertTrue(self.request.get_cookie('token'))
             self.assertEqual(self.auth.user().name, 'testuser123')
@@ -71,17 +66,16 @@ def test_login_user1(self):
     def test_login_with_no_password(self):
         with self.assertRaises(TypeError):
             for driver in ('cookie', 'jwt'):
-                # self.auth.driver = driver
+                self.auth.driver(driver)
+                self.auth.driver = driver
                 self.assertTrue(self.auth.login('nopassword@email.com', None))
 
-    # def test_can_login_with_second_password(self):
-    #     self.auth.auth_model.__password__ = 'second_password'
-    #     self.assertTrue(self.auth.login('user@email.com', 'pass123'))
-    #     self.assertTrue(self.request.get_cookie('token'))
+    def test_guard_switches_guard(self):
+        self.assertIsInstance(self.auth.guard('web'), WebGuard)
 
     def test_login_user_with_list_auth_column(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.auth.auth_model.__auth__ = ['name', 'email']
             self.assertTrue(self.auth.login('testuser123', 'secret'))
             self.assertTrue(self.request.get_cookie('token'))
@@ -94,30 +88,31 @@ def test_can_register(self):
         })
 
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(User.where('email', 'joe@email.com').first())
             self.assertNotEqual(User.where('email', 'joe@email.com').first().password, 'secret')
 
     def test_get_user(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(self.auth.login_by_id(1))
             self.assertTrue(self.request.user())
 
     def test_get_user_returns_false_if_not_loggedin(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.auth.login('user@email.com', 'wrong_secret')
             self.assertFalse(self.auth.user())
 
     def test_logout_user(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.auth.login('user@email.com', 'secret')
             self.assertTrue(self.request.get_cookie('token'))
             self.assertTrue(self.auth.user())
             self.assertTrue(self.request.user())
-
+            self.auth.driver('jwt')
+            
             self.auth.logout()
             self.assertFalse(self.request.get_cookie('token'))
             self.assertFalse(self.auth.user())
@@ -125,34 +120,29 @@ def test_logout_user(self):
 
     def test_login_user_fails(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertFalse(self.auth.login('user@email.com', 'bad_password'))
 
     def test_login_user_success(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(self.auth.login('user@email.com', 'secret'))
 
     def test_login_by_id(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(self.auth.login_by_id(1))
             self.assertTrue(self.request.get_cookie('token'))
             self.assertFalse(self.auth.login_by_id(3))
 
     def test_login_once_does_not_set_cookie(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             self.assertTrue(self.auth.once().login_by_id(1))
             self.assertIsNone(self.request.get_cookie('token'))
 
-    # def test_user_is_mustverify_instance(self):
-    #     self.assertIsInstance(self.auth.once().login_by_id(1), MustVerifyEmail)
-    #     self.assertNotIsInstance(self.auth.once().login_by_id(1), MustVerifyEmail)
-
     def test_confirm_controller_success(self):
         for driver in ('jwt', 'cookie'):
-            self.auth.driver = driver
             params = {'id': Sign().sign('{0}::{1}'.format(1, time.time()))}
             self.request.set_params(params)
             user = self.auth.once().login_by_id(1)
@@ -177,7 +167,7 @@ def test_confirm_controller_success(self):
 
     def test_confirm_controller_failure(self):
         for driver in ('cookie', 'jwt'):
-            self.auth.driver = driver
+            self.auth.driver(driver)
             timestamp_plus_11 = datetime.datetime.now() - datetime.timedelta(minutes=11)
 
             params = {'id': Sign().sign('{0}::{1}'.format(1, timestamp_plus_11.timestamp()))}

From cc28fad96d3b38dbbed732d12898a206f930e95c Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 00:51:08 -0400
Subject: [PATCH 42/59] guards must be registered

---
 src/masonite/auth/guards/Guard.py    |  5 ++++-
 src/masonite/auth/guards/WebGuard.py |  8 ++++++++
 tests/core/test_auth.py              | 16 ++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/masonite/auth/guards/Guard.py b/src/masonite/auth/guards/Guard.py
index c240ccff9..ce19acfb2 100644
--- a/src/masonite/auth/guards/Guard.py
+++ b/src/masonite/auth/guards/Guard.py
@@ -5,7 +5,7 @@
 class Guard:
 
     guards = {
-        'web': WebGuard
+        # 'web': WebGuard
     }
 
     def __init__(self, app: App, guard=None):
@@ -26,6 +26,9 @@ def get(self):
     def driver(self, key):
         return self._guard.make(key)
 
+    def register_guard(self, guard, cls):
+        self.guards.update({guard: cls})
+
     def login(self, *args, **kwargs):
         return self._guard.login(*args, **kwargs)
     
diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
index 1bcbff87d..5124dd504 100644
--- a/src/masonite/auth/guards/WebGuard.py
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -32,6 +32,14 @@ def guard(self, guard):
         from .Guard import Guard
         return Guard(self.app, guard).get()
 
+    def register_driver(self, key, cls):
+        self.drivers.update({key: cls})
+
+    def register_guard(self, key, cls):
+        from .Guard import Guard
+        return Guard.guards.update({key: cls})
+
+
     def make(self, key):
         if key in self.drivers:
             self.driver = self.app.resolve(self.drivers[key])
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 35c5ba547..6d5986c50 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -6,7 +6,6 @@
 from src.masonite.app import App
 from src.masonite.auth import Auth, MustVerifyEmail, Sign
 from src.masonite.auth.guards import Guard, WebGuard
-from src.masonite.managers import AuthManager
 from src.masonite.drivers import AuthCookieDriver, AuthJwtDriver
 from src.masonite.helpers import password as bcrypt_password
 from src.masonite.routes import Get
@@ -41,7 +40,8 @@ def setUp(self):
         self.container.bind('ViewClass', view)
 
 
-        self.auth = Guard(self.app, 'web')
+        self.auth = Guard(self.app)
+        self.auth.register_guard('web', WebGuard)
         self.app.swap(Auth, self.auth)
         self.request.load_app(self.app)
 
@@ -135,6 +135,18 @@ def test_login_by_id(self):
             self.assertTrue(self.request.get_cookie('token'))
             self.assertFalse(self.auth.login_by_id(3))
 
+    def test_guard_can_register_new_drivers(self):
+        self.auth.guard('web').register_driver('api', AuthJwtDriver)
+
+        self.assertIsInstance(self.auth.driver('api'), AuthJwtDriver)
+        
+
+    def test_guard_can_register_new_guards(self):
+        self.auth.register_guard('api_guard', AuthJwtDriver)
+
+        self.assertIsInstance(self.auth.guard('api_guard'), AuthJwtDriver)
+        
+
     def test_login_once_does_not_set_cookie(self):
         for driver in ('cookie', 'jwt'):
             self.auth.driver(driver)

From de2e46d9773d91c8031e76dffa02967a8ebba377 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 20:19:37 -0400
Subject: [PATCH 43/59] fixed guards

---
 src/masonite/auth/guards/Guard.py    | 10 +++++-----
 src/masonite/auth/guards/WebGuard.py |  3 +--
 tests/core/test_auth.py              |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/masonite/auth/guards/Guard.py b/src/masonite/auth/guards/Guard.py
index ce19acfb2..356e22936 100644
--- a/src/masonite/auth/guards/Guard.py
+++ b/src/masonite/auth/guards/Guard.py
@@ -4,13 +4,10 @@
 
 class Guard:
 
-    guards = {
-        # 'web': WebGuard
-    }
+    guards = {}
 
-    def __init__(self, app: App, guard=None):
+    def __init__(self, app: App):
         self.app = app
-        self._guard = self.make(guard or config('auth.auth.defaults.guard'))
 
     def register(self, key, cls):
         self.guards.update({key: cls})
@@ -20,6 +17,9 @@ def make(self, key):
             self._guard = self.app.resolve(self.guards[key])
             return self._guard
 
+    def set(self, key):
+        return self.make(key)
+
     def get(self):
         return self._guard
 
diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
index 5124dd504..1fca8eac0 100644
--- a/src/masonite/auth/guards/WebGuard.py
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -30,7 +30,7 @@ def guard(self, guard):
             guard {[type]} -- [description]
         """
         from .Guard import Guard
-        return Guard(self.app, guard).get()
+        return Guard(self.app).make(guard)
 
     def register_driver(self, key, cls):
         self.drivers.update({key: cls})
@@ -39,7 +39,6 @@ def register_guard(self, key, cls):
         from .Guard import Guard
         return Guard.guards.update({key: cls})
 
-
     def make(self, key):
         if key in self.drivers:
             self.driver = self.app.resolve(self.drivers[key])
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 6d5986c50..394d9a2d8 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -42,6 +42,7 @@ def setUp(self):
 
         self.auth = Guard(self.app)
         self.auth.register_guard('web', WebGuard)
+        self.auth.set('web')
         self.app.swap(Auth, self.auth)
         self.request.load_app(self.app)
 

From 35d4224443f98854689034c1d16aea3e67ed80c1 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 20:43:19 -0400
Subject: [PATCH 44/59] added authentication provider

---
 config/providers.py                           |  3 +-
 src/masonite/providers/AppProvider.py         | 96 +++++++++----------
 .../providers/AuthenticationProvider.py       | 20 ++++
 src/masonite/providers/__init__.py            |  1 +
 4 files changed, 67 insertions(+), 53 deletions(-)
 create mode 100644 src/masonite/providers/AuthenticationProvider.py

diff --git a/config/providers.py b/config/providers.py
index 3bc7c4404..aa4400537 100644
--- a/config/providers.py
+++ b/config/providers.py
@@ -1,6 +1,6 @@
 """Providers Configuration File."""
 
-from src.masonite.providers import (AppProvider, BroadcastProvider, CacheProvider,
+from src.masonite.providers import (AppProvider, AuthenticationProvider, BroadcastProvider, CacheProvider,
                                 CsrfProvider, HelpersProvider, MailProvider,
                                 QueueProvider, RouteProvider, SassProvider,
                                 SessionProvider, StatusCodeProvider,
@@ -22,6 +22,7 @@
     StatusCodeProvider,
     WhitenoiseProvider,
     ViewProvider,
+    AuthenticationProvider,
 
     # Optional Framework Providers
     SassProvider,
diff --git a/src/masonite/providers/AppProvider.py b/src/masonite/providers/AppProvider.py
index 0d25e30b2..ddc331650 100644
--- a/src/masonite/providers/AppProvider.py
+++ b/src/masonite/providers/AppProvider.py
@@ -1,21 +1,18 @@
 """An AppProvider Service Provider."""
 
-from ..auth import Auth
 from ..autoload import Autoload
 from ..commands import (AuthCommand, CommandCommand, ControllerCommand,
-                               DownCommand, InfoCommand, InstallCommand,
-                               JobCommand, KeyCommand, MakeMigrationCommand,
-                               MiddlewareCommand, MigrateCommand,
-                               MigrateRefreshCommand, MigrateResetCommand,
-                               MigrateRollbackCommand, MigrateStatusCommand,
-                               ModelCommand, ModelDocstringCommand,
-                               ProviderCommand, PublishCommand,
-                               QueueTableCommand, QueueWorkCommand,
-                               RoutesCommand, SeedCommand, SeedRunCommand,
-                               ServeCommand, TestCommand, TinkerCommand, UpCommand,
-                               ViewCommand)
+                        DownCommand, InfoCommand, InstallCommand, JobCommand,
+                        KeyCommand, MakeMigrationCommand, MiddlewareCommand,
+                        MigrateCommand, MigrateRefreshCommand,
+                        MigrateResetCommand, MigrateRollbackCommand,
+                        MigrateStatusCommand, ModelCommand,
+                        ModelDocstringCommand, ProviderCommand, PublishCommand,
+                        QueueTableCommand, QueueWorkCommand, RoutesCommand,
+                        SeedCommand, SeedRunCommand, ServeCommand, TestCommand,
+                        TinkerCommand, UpCommand, ViewCommand)
 from ..exception_handler import DumpHandler, ExceptionHandler
-from ..helpers import config
+from ..helpers import config, load
 from ..helpers.routes import flatten_routes
 from ..hook import Hook
 from ..provider import ServiceProvider
@@ -23,29 +20,22 @@
 from ..response import Response
 from ..routes import Route
 
-from ..managers import AuthManager
-from ..drivers import AuthCookieDriver, AuthJwtDriver
-from ..helpers import load
-
 
 class AppProvider(ServiceProvider):
 
     def register(self):
         self.app.bind('HookHandler', Hook(self.app))
         self.app.bind('WebRoutes', flatten_routes(load('routes.web.routes')))
-        # self.app.bind('Storage', config('storage'))
         self.app.bind('Route', Route())
         self.app.bind('Request', Request())
         self.app.simple(Response(self.app))
         self.app.bind('Container', self.app)
         self.app.bind('ExceptionHandler', ExceptionHandler(self.app))
         self.app.bind('ExceptionDumpExceptionHandler', DumpHandler)
-        self.app.bind('AuthCookieDriver', AuthCookieDriver)
-        self.app.bind('AuthJwtDriver', AuthJwtDriver)
-        self.app.bind('AuthManager', AuthManager(self.app).driver('cookie'))
+
+
         self.app.bind('RouteMiddleware', config('middleware.route_middleware'))
         self.app.bind('HttpMiddleware', config('middleware.http_middleware'))
-        self.app.bind('Auth', Auth)
         self.app.bind('staticfiles', config('storage.staticfiles', {}))
 
         # Insert Commands
@@ -62,33 +52,35 @@ def _autoload(self, directories):
         Autoload(self.app).load(directories)
 
     def _load_commands(self):
-        self.app.bind('MasoniteAuthCommand', AuthCommand())
-        self.app.bind('MasoniteCommandCommand', CommandCommand())
-        self.app.bind('MasoniteControllerCommand', ControllerCommand())
-        self.app.bind('MasoniteDownCommand', DownCommand())
-        self.app.bind('MasoniteInfoCommand', InfoCommand())
-        self.app.bind('MasoniteInstallCommand', InstallCommand())
-        self.app.bind('MasoniteJobCommand', JobCommand())
-        self.app.bind('MasoniteKeyCommand', KeyCommand())
-        self.app.bind('MasoniteMakeMigrationCommand', MakeMigrationCommand())
-        self.app.bind('MasoniteMiddlewareCommand', MiddlewareCommand())
-        self.app.bind('MasoniteMigrateCommand', MigrateCommand())
-        self.app.bind('MasoniteMigrateRefreshCommand', MigrateRefreshCommand())
-        self.app.bind('MasoniteMigrateResetCommand', MigrateResetCommand())
-        self.app.bind('MasoniteMigrateStatusCommand', MigrateStatusCommand())
-        self.app.bind('MasoniteMigrateRollbackCommand',
-                      MigrateRollbackCommand())
-        self.app.bind('MasoniteModelCommand', ModelCommand())
-        self.app.bind('MasoniteModelDocstringCommand', ModelDocstringCommand())
-        self.app.bind('MasoniteProviderCommand', ProviderCommand())
-        self.app.bind('MasonitePublishCommand', PublishCommand())
-        self.app.bind('MasoniteQueueWorkCommand', QueueWorkCommand())
-        self.app.bind('MasoniteQueueTableCommand', QueueTableCommand())
-        self.app.bind('MasoniteViewCommand', ViewCommand())
-        self.app.bind('MasoniteRoutesCommand', RoutesCommand())
-        self.app.bind('MasoniteServeCommand', ServeCommand())
-        self.app.bind('MasoniteSeedCommand', SeedCommand())
-        self.app.bind('MasoniteSeedRunCommand', SeedRunCommand())
-        self.app.bind('MasoniteTestCommand', TestCommand())
-        self.app.bind('MasoniteTinkerCommand', TinkerCommand())
-        self.app.bind('MasoniteUpCommand', UpCommand())
+        self.commands(
+            AuthCommand(),
+            CommandCommand(),
+            ControllerCommand(),
+            DownCommand(),
+            InfoCommand(),
+            InstallCommand(),
+            JobCommand(),
+            KeyCommand(),
+            MakeMigrationCommand(),
+            MiddlewareCommand(),
+            MigrateCommand(),
+            MigrateRefreshCommand(),
+            MigrateResetCommand(),
+            MigrateStatusCommand(),
+            MigrateRollbackCommand(),
+            ModelCommand(),
+            ModelDocstringCommand(),
+            ProviderCommand(),
+            PublishCommand(),
+            QueueWorkCommand(),
+            QueueTableCommand(),
+            ViewCommand(),
+            RoutesCommand(),
+            ServeCommand(),
+            SeedCommand(),
+            SeedRunCommand(),
+            TestCommand(), 
+            TinkerCommand(), 
+            UpCommand()
+        )
+
diff --git a/src/masonite/providers/AuthenticationProvider.py b/src/masonite/providers/AuthenticationProvider.py
new file mode 100644
index 000000000..d9907d19e
--- /dev/null
+++ b/src/masonite/providers/AuthenticationProvider.py
@@ -0,0 +1,20 @@
+"""An Authentication Service Provider."""
+
+from ..auth.guards import Guard, WebGuard
+from ..auth import Auth
+from ..helpers import config
+from ..provider import ServiceProvider
+
+
+class AuthenticationProvider(ServiceProvider):
+
+    wsgi = False
+
+    def register(self):
+        guard = Guard(self.app)
+        guard.register_guard('web', WebGuard)
+        self.app.simple(guard)
+        self.app.swap(Auth, guard)
+
+    def boot(self, auth: Auth):
+        auth.set(config('auth.auth.defaults.guard'))
diff --git a/src/masonite/providers/__init__.py b/src/masonite/providers/__init__.py
index e0f570085..0a4275616 100644
--- a/src/masonite/providers/__init__.py
+++ b/src/masonite/providers/__init__.py
@@ -1,4 +1,5 @@
 from .AppProvider import AppProvider
+from .AuthenticationProvider import AuthenticationProvider
 from .BroadcastProvider import BroadcastProvider
 from .CacheProvider import CacheProvider
 from .CsrfProvider import CsrfProvider

From ac747a1c65924620009f5c20b56f27f9c6a4a8af Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 21:10:07 -0400
Subject: [PATCH 45/59] added guard middleware

---
 src/masonite/middleware/GuardMiddleware.py | 15 ++++++++++++
 src/masonite/middleware/__init__.py        |  1 +
 tests/core/test_auth_middleware.py         | 28 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 src/masonite/middleware/GuardMiddleware.py
 create mode 100644 tests/core/test_auth_middleware.py

diff --git a/src/masonite/middleware/GuardMiddleware.py b/src/masonite/middleware/GuardMiddleware.py
new file mode 100644
index 000000000..92ee4e888
--- /dev/null
+++ b/src/masonite/middleware/GuardMiddleware.py
@@ -0,0 +1,15 @@
+"""CSRF Middleware."""
+
+from ..auth import Auth
+
+class GuardMiddleware:
+    """Middleware to switch the guard"""
+
+    def __init__(self, auth: Auth):
+        self.auth = auth
+
+    def before(self, guard):
+        self.auth.set(guard)
+
+    def after(self, guard):
+        pass
diff --git a/src/masonite/middleware/__init__.py b/src/masonite/middleware/__init__.py
index bc4352a4f..87d11f2c0 100644
--- a/src/masonite/middleware/__init__.py
+++ b/src/masonite/middleware/__init__.py
@@ -1,4 +1,5 @@
 from .CsrfMiddleware import CsrfMiddleware
+from .GuardMiddleware import GuardMiddleware
 from .CorsMiddleware import CorsMiddleware
 from .MaintenanceModeMiddleware import MaintenanceModeMiddleware
 from .ResponseMiddleware import ResponseMiddleware
diff --git a/tests/core/test_auth_middleware.py b/tests/core/test_auth_middleware.py
new file mode 100644
index 000000000..cb2578e1a
--- /dev/null
+++ b/tests/core/test_auth_middleware.py
@@ -0,0 +1,28 @@
+from src.masonite.auth.guards import WebGuard
+
+from src.masonite.auth import Auth
+from src.masonite.middleware import GuardMiddleware
+from src.masonite.routes import Get
+from src.masonite.testing import TestCase
+
+
+class TestAuthMiddleware(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.container.make(Auth).register_guard('api', Get)
+        self.withRouteMiddleware({
+            'guard': GuardMiddleware,
+        })
+
+        self.routes([
+            Get('/guard/web', 'TestController@show').middleware('guard:web'),
+            Get('/guard/api', 'TestController@show').middleware('guard:api')
+        ])
+    
+    def test_can_switch_guards(self):
+        self.get('/guard/web')
+        self.assertIsInstance(self.container.make(Auth).get(), WebGuard)
+        
+        self.get('/guard/api')
+        self.assertIsInstance(self.container.make(Auth).get(), Get)
\ No newline at end of file

From 553d15de15d40764a9eae6a3d496de14b2e58b33 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 21:53:45 -0400
Subject: [PATCH 46/59] fixed guard test

---
 src/masonite/middleware/GuardMiddleware.py |  3 ++-
 tests/core/test_auth_middleware.py         | 24 +++++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/masonite/middleware/GuardMiddleware.py b/src/masonite/middleware/GuardMiddleware.py
index 92ee4e888..525df969d 100644
--- a/src/masonite/middleware/GuardMiddleware.py
+++ b/src/masonite/middleware/GuardMiddleware.py
@@ -1,6 +1,7 @@
 """CSRF Middleware."""
 
 from ..auth import Auth
+from ..helpers import config
 
 class GuardMiddleware:
     """Middleware to switch the guard"""
@@ -12,4 +13,4 @@ def before(self, guard):
         self.auth.set(guard)
 
     def after(self, guard):
-        pass
+        self.auth.set(config('auth.auth.defaults.guard'))
diff --git a/tests/core/test_auth_middleware.py b/tests/core/test_auth_middleware.py
index cb2578e1a..d41c74b4f 100644
--- a/tests/core/test_auth_middleware.py
+++ b/tests/core/test_auth_middleware.py
@@ -5,24 +5,34 @@
 from src.masonite.routes import Get
 from src.masonite.testing import TestCase
 
+class MockApiGuard:
+
+    def user(self):
+        return 'user'
+
+class MockController:
+
+    def user(self, auth: Auth):
+        return auth.user()
 
 class TestAuthMiddleware(TestCase):
 
     def setUp(self):
         super().setUp()
-        self.container.make(Auth).register_guard('api', Get)
+        self.container.make(Auth).register_guard('api', MockApiGuard)
+
         self.withRouteMiddleware({
             'guard': GuardMiddleware,
         })
 
         self.routes([
-            Get('/guard/web', 'TestController@show').middleware('guard:web'),
-            Get('/guard/api', 'TestController@show').middleware('guard:api')
-        ])
+            Get('/guard/web', MockController.user).middleware('guard:web'),
+            Get('/guard/api', MockController.user).middleware('guard:api')
+        ]) 
     
     def test_can_switch_guards(self):
-        self.get('/guard/web')
+        self.get('/guard/web').assertContains('False')
         self.assertIsInstance(self.container.make(Auth).get(), WebGuard)
         
-        self.get('/guard/api')
-        self.assertIsInstance(self.container.make(Auth).get(), Get)
\ No newline at end of file
+        self.get('/guard/api').assertContains('user')
+        self.assertIsInstance(self.container.make(Auth).get(), WebGuard)
\ No newline at end of file

From 0983c7e2ae22afb3ccad8120bcf1534bf65d8c8a Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Wed, 30 Oct 2019 22:57:39 -0400
Subject: [PATCH 47/59] removed references to testsuite class

---
 .../drivers/session/SessionCookieDriver.py    |   8 +-
 .../drivers/session/SessionMemoryDriver.py    |  12 +-
 src/masonite/testing/MockRoute.py             |   2 +-
 src/masonite/testing/TestCase.py              |   2 +-
 src/masonite/testing/__init__.py              |   1 +
 src/masonite/testing/generate_wsgi.py         |  31 +++++
 src/masonite/testsuite/TestRequest.py         |  25 ----
 src/masonite/testsuite/TestRoute.py           |  18 ---
 src/masonite/testsuite/TestSuite.py           | 117 ------------------
 src/masonite/testsuite/__init__.py            |   3 -
 tests/broadcasts/test_sockets.py              |  40 +++---
 tests/core/test_app.py                        |   2 +-
 tests/core/test_auth.py                       |   2 +-
 tests/core/test_cookie_signing.py             |   2 +-
 tests/core/test_exception.py                  |   2 +-
 tests/core/test_extends.py                    |   2 +-
 tests/core/test_providers.py                  |  26 ++--
 tests/core/test_request_routes.py             |  31 +++--
 tests/core/test_requests.py                   |   2 +-
 tests/core/test_routes.py                     |   3 +-
 tests/core/test_service_provider.py           |  48 +++----
 tests/core/test_session.py                    |  53 ++++----
 tests/helpers/test_view_helpers.py            |   2 +-
 tests/middleware/test_cors_middleware.py      |  13 +-
 tests/middleware/test_csrf_middleware.py      |  35 +++---
 .../test_maintenance_mode_middleware.py       |   2 +-
 .../test_secure_headers_middleware.py         |  12 +-
 tests/providers/test_statuscode_provider.py   |   2 +-
 tests/storage/test_storage_manager.py         |  14 +--
 29 files changed, 187 insertions(+), 325 deletions(-)
 create mode 100644 src/masonite/testing/generate_wsgi.py
 delete mode 100644 src/masonite/testsuite/TestRequest.py
 delete mode 100644 src/masonite/testsuite/TestRoute.py
 delete mode 100644 src/masonite/testsuite/TestSuite.py
 delete mode 100644 src/masonite/testsuite/__init__.py

diff --git a/src/masonite/drivers/session/SessionCookieDriver.py b/src/masonite/drivers/session/SessionCookieDriver.py
index ff560d124..e63579abc 100644
--- a/src/masonite/drivers/session/SessionCookieDriver.py
+++ b/src/masonite/drivers/session/SessionCookieDriver.py
@@ -5,20 +5,18 @@
 from ...contracts import SessionContract
 from ...drivers import BaseDriver
 from ...request import Request
-from ...app import App
 
 
 class SessionCookieDriver(SessionContract, BaseDriver):
     """Cookie Session Driver."""
 
-    def __init__(self, request: Request, app: App):
+    def __init__(self, request: Request):
         """Cookie Session Constructor.
 
         Arguments:
             Environ {dict} -- The WSGI environment
             Request {masonite.request.Request} -- The Request class.
         """
-        self.environ = app.make('Environ')
         self.request = request
 
     def get(self, key):
@@ -97,8 +95,8 @@ def __collect_data(self):
             dict
         """
         cookies = {}
-        if 'HTTP_COOKIE' in self.environ and self.environ['HTTP_COOKIE']:
-            cookies_original = self.environ['HTTP_COOKIE'].split(';')
+        if 'HTTP_COOKIE' in self.request.environ and self.request.environ['HTTP_COOKIE']:
+            cookies_original = self.request.environ['HTTP_COOKIE'].split(';')
             for cookie in cookies_original:
                 if cookie.strip().startswith('s_') or cookie.strip().startswith('f_'):
                     data = cookie.split("=", 1)
diff --git a/src/masonite/drivers/session/SessionMemoryDriver.py b/src/masonite/drivers/session/SessionMemoryDriver.py
index e324ecc01..b3e6eff86 100644
--- a/src/masonite/drivers/session/SessionMemoryDriver.py
+++ b/src/masonite/drivers/session/SessionMemoryDriver.py
@@ -2,7 +2,7 @@
 
 from ...contracts import SessionContract
 from ...drivers import BaseDriver
-from ...app import App
+from ...request import Request
 
 
 class SessionMemoryDriver(SessionContract, BaseDriver):
@@ -11,13 +11,13 @@ class SessionMemoryDriver(SessionContract, BaseDriver):
     _session = {}
     _flash = {}
 
-    def __init__(self, app: App):
+    def __init__(self, request: Request):
         """Cookie Session Constructor.
 
         Arguments:
             Environ {dict} -- The WSGI environment
         """
-        self.environ = app.make('Environ')
+        self.request = request
 
     def get(self, key):
         """Get a value from the session.
@@ -117,10 +117,10 @@ def delete(self, key):
 
     def __get_client_address(self):
         """Get ip from the client."""
-        if 'HTTP_X_FORWARDED_FOR' in self.environ:
-            return self.environ['HTTP_X_FORWARDED_FOR'].split(',')[-1].strip()
+        if 'HTTP_X_FORWARDED_FOR' in self.request.environ:
+            return self.request.environ['HTTP_X_FORWARDED_FOR'].split(',')[-1].strip()
 
-        return self.environ['REMOTE_ADDR']
+        return self.request.environ['REMOTE_ADDR']
 
     def __collect_data(self, key=False):
         """Collect data from session and flash data.
diff --git a/src/masonite/testing/MockRoute.py b/src/masonite/testing/MockRoute.py
index 79559eb3d..a9f818434 100644
--- a/src/masonite/testing/MockRoute.py
+++ b/src/masonite/testing/MockRoute.py
@@ -1,5 +1,5 @@
 from ..request import Request
-from ..testsuite import TestSuite, generate_wsgi
+from .generate_wsgi import generate_wsgi
 import json
 from ..helpers import Dot
 
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index bb5e211ef..6dcca817a 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -9,7 +9,7 @@
 from ..exceptions import RouteNotFoundException
 from ..helpers.migrations import Migrations
 from ..helpers.routes import create_matchurl, flatten_routes
-from ..testsuite import generate_wsgi
+from .generate_wsgi import generate_wsgi
 from orator.orm import Factory
 from ..app import App
 
diff --git a/src/masonite/testing/__init__.py b/src/masonite/testing/__init__.py
index deca49fab..1d4ffd931 100644
--- a/src/masonite/testing/__init__.py
+++ b/src/masonite/testing/__init__.py
@@ -1,2 +1,3 @@
 from .TestCase import TestCase
 from .MockRoute import MockRoute
+from .generate_wsgi import generate_wsgi
diff --git a/src/masonite/testing/generate_wsgi.py b/src/masonite/testing/generate_wsgi.py
new file mode 100644
index 000000000..05e258a3a
--- /dev/null
+++ b/src/masonite/testing/generate_wsgi.py
@@ -0,0 +1,31 @@
+
+import io
+
+def generate_wsgi():
+    return {
+        'wsgi.version': (1, 0),
+        'wsgi.multithread': False,
+        'wsgi.multiprocess': True,
+        'wsgi.run_once': False,
+        'wsgi.input': io.BytesIO(),
+        'SERVER_SOFTWARE': 'gunicorn/19.7.1',
+        'REQUEST_METHOD': 'GET',
+        'QUERY_STRING': 'application=Masonite',
+        'RAW_URI': '/',
+        'SERVER_PROTOCOL': 'HTTP/1.1',
+        'HTTP_HOST': '127.0.0.1:8000',
+        'HTTP_ACCEPT': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'HTTP_UPGRADE_INSECURE_REQUESTS': '1',
+        'HTTP_COOKIE': 'setcookie=value',
+        'HTTP_USER_AGENT': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0.2 Safari/604.4.7',
+        'HTTP_ACCEPT_LANGUAGE': 'en-us',
+        'HTTP_ACCEPT_ENCODING': 'gzip, deflate',
+        'HTTP_CONNECTION': 'keep-alive',
+        'wsgi.url_scheme': 'http',
+        'REMOTE_ADDR': '127.0.0.1',
+        'REMOTE_PORT': '62241',
+        'SERVER_NAME': '127.0.0.1',
+        'SERVER_PORT': '8000',
+        'PATH_INFO': '/',
+        'SCRIPT_NAME': ''
+    }
diff --git a/src/masonite/testsuite/TestRequest.py b/src/masonite/testsuite/TestRequest.py
deleted file mode 100644
index af74e8f8a..000000000
--- a/src/masonite/testsuite/TestRequest.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import requests
-
-
-class TestRequest:
-
-    def __init__(self):
-        self.request = None
-        pass
-
-    def get(self, route_url):
-        from config import application
-        self.request = requests.get(application.URL + route_url)
-        return self
-
-    def status_code(self, code):
-        if self.request.status_code == code:
-            return True
-
-        return False
-
-    def contains(self, content):
-        if content in self.request.text:
-            return True
-
-        return False
diff --git a/src/masonite/testsuite/TestRoute.py b/src/masonite/testsuite/TestRoute.py
deleted file mode 100644
index 667def4ae..000000000
--- a/src/masonite/testsuite/TestRoute.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from ..routes import Get
-
-
-class TestRoute:
-
-    def __init__(self, route):
-        self.route = None
-        from routes import web
-        for routes in web.ROUTES:
-            if routes.route_url == route:
-                self.route = routes
-                break
-
-    def exists(self):
-        return isinstance(self.route, Get)
-
-    def hasMiddleware(self, middleware):
-        return middleware in self.route.list_middleware
diff --git a/src/masonite/testsuite/TestSuite.py b/src/masonite/testsuite/TestSuite.py
deleted file mode 100644
index a9bc3a4ac..000000000
--- a/src/masonite/testsuite/TestSuite.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import io
-
-from ..app import App
-from .TestRequest import TestRequest
-from .TestRoute import TestRoute
-
-
-def generate_wsgi():
-    return {
-        'wsgi.version': (1, 0),
-        'wsgi.multithread': False,
-        'wsgi.multiprocess': True,
-        'wsgi.run_once': False,
-        'wsgi.input': io.BytesIO(),
-        'SERVER_SOFTWARE': 'gunicorn/19.7.1',
-        'REQUEST_METHOD': 'GET',
-        'QUERY_STRING': 'application=Masonite',
-        'RAW_URI': '/',
-        'SERVER_PROTOCOL': 'HTTP/1.1',
-        'HTTP_HOST': '127.0.0.1:8000',
-        'HTTP_ACCEPT': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-        'HTTP_UPGRADE_INSECURE_REQUESTS': '1',
-        'HTTP_COOKIE': 'setcookie=value',
-        'HTTP_USER_AGENT': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/604.4.7 (KHTML, like Gecko) Version/11.0.2 Safari/604.4.7',
-        'HTTP_ACCEPT_LANGUAGE': 'en-us',
-        'HTTP_ACCEPT_ENCODING': 'gzip, deflate',
-        'HTTP_CONNECTION': 'keep-alive',
-        'wsgi.url_scheme': 'http',
-        'REMOTE_ADDR': '127.0.0.1',
-        'REMOTE_PORT': '62241',
-        'SERVER_NAME': '127.0.0.1',
-        'SERVER_PORT': '8000',
-        'PATH_INFO': '/',
-        'SCRIPT_NAME': ''
-    }
-
-
-class TestSuite:
-
-    def create_container(self, wsgi=generate_wsgi(), container=None, routes=[]):
-        from config import providers
-        if not container:
-            container = App(remember=False)
-
-        container.bind('WSGI', wsgi)
-        container.bind('Container', container)
-        container.bind('ProviderList', providers.PROVIDERS)
-        container.bind('Providers', [])
-        container.bind('WSGIProviders', [])
-
-        """
-        |--------------------------------------------------------------------------
-        | Bind all service providers
-        |--------------------------------------------------------------------------
-        |
-        | Let's register everything into the Service Container. Once everything is
-        | in the container we can run through all the boot methods. For reasons
-        | some providers don't need to execute with every request and should
-        | only run once when the server is started. Providers will be ran
-        | once if the wsgi attribute on a provider is False.
-        |
-        """
-
-        for provider in container.make('ProviderList'):
-            try:
-                located_provider = provider()
-            except TypeError:
-                located_provider = provider
-
-            located_provider.load_app(container).register()
-            if located_provider.wsgi:
-                container.make('WSGIProviders').append(located_provider)
-            else:
-                container.make('Providers').append(located_provider)
-
-        for provider in container.make('Providers'):
-            container.resolve(provider.boot)
-
-        """
-        |--------------------------------------------------------------------------
-        | Startup the Service Container
-        |--------------------------------------------------------------------------
-        |
-        | Instantiate the Service Container so we can bind classes into it and
-        | bind the environ variable that is created by the WSGI server into
-        | the container.
-        |
-        """
-
-        container.bind('Environ', wsgi)
-
-        """
-        |--------------------------------------------------------------------------
-        | Execute All Service Providers
-        |--------------------------------------------------------------------------
-        |
-        | Run all service provider boot methods if the wsgi attribute is true.
-        |
-        """
-
-        if routes:
-            container.bind('WebRoutes', routes)
-
-        for provider in container.make('WSGIProviders'):
-            container.resolve(provider.boot)
-
-        self.container = container
-        return self
-
-    def get_container(self):
-        return self.container
-
-    def route(self, route):
-        return TestRoute(route)
-
-    def get(self, route_url):
-        return TestRequest().get(route_url)
diff --git a/src/masonite/testsuite/__init__.py b/src/masonite/testsuite/__init__.py
deleted file mode 100644
index 786267b4e..000000000
--- a/src/masonite/testsuite/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .TestRequest import TestRequest
-from .TestRoute import TestRoute
-from .TestSuite import TestSuite, generate_wsgi
diff --git a/tests/broadcasts/test_sockets.py b/tests/broadcasts/test_sockets.py
index 3b3d38fec..4f942332c 100644
--- a/tests/broadcasts/test_sockets.py
+++ b/tests/broadcasts/test_sockets.py
@@ -2,34 +2,34 @@
 
 from src.masonite.drivers import BroadcastPusherDriver
 from src.masonite.managers import BroadcastManager
-from src.masonite.testsuite.TestSuite import TestSuite
+from src.masonite.testing import TestCase
 import unittest
 
 if os.getenv('ABLY_SECRET'):
 
-    class TestSockets(unittest.TestCase):
+    class TestSockets(TestCase):
 
         def setUp(self):
-            self.app = TestSuite().create_container().container
-            self.app.bind('BroadcastPusherDriver', BroadcastPusherDriver)
-            self.app.bind('BroadcastManager', BroadcastManager)
+            super().setUp()
+            self.container.bind('BroadcastPusherDriver', BroadcastPusherDriver)
+            self.container.bind('BroadcastManager', BroadcastManager)
 
         def test_broadcast_loads_into_container(self):
-            self.app.bind('Broadcast', self.app.make('BroadcastManager').driver('pusher'))
+            self.container.bind('Broadcast', self.container.make('BroadcastManager').driver('pusher'))
 
-            self.assertIsNotNone(self.app.make('BroadcastManager'))
-            self.assertEqual(self.app.make('Broadcast').channel('random', 'from driver'), {'message': 'from driver'})
-            self.assertEqual(self.app.make('Broadcast').channel('random', {'message': 'dictionary'}), {'message': 'dictionary'})
-            self.assertEqual(self.app.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}), {'message': 'dictionary'})
-            self.assertEqual(self.app.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'})
-            self.assertTrue(self.app.make('Broadcast').ssl(True).ssl_message)
+            self.assertIsNotNone(self.container.make('BroadcastManager'))
+            self.assertEqual(self.container.make('Broadcast').channel('random', 'from driver'), {'message': 'from driver'})
+            self.assertEqual(self.container.make('Broadcast').channel('random', {'message': 'dictionary'}), {'message': 'dictionary'})
+            self.assertEqual(self.container.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}), {'message': 'dictionary'})
+            self.assertEqual(self.container.make('Broadcast').channel(['channel1', 'channel2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'})
+            self.assertTrue(self.container.make('Broadcast').ssl(True).ssl_message)
 
         def test_broadcast_loads_into_container_with_ably(self):
-            self.app.bind('Broadcast', self.app.make('BroadcastManager').driver('ably'))
-
-            self.assertIsNotNone(self.app.make('BroadcastManager'))
-            self.assertEqual(self.app.make('Broadcast').channel('test-channel', 'from driver'), 'from driver')
-            self.assertEqual(self.app.make('Broadcast').channel('test-channel', {'message': 'from driver'}), {'message': 'from driver'})
-            self.assertEqual(self.app.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}), {'message': 'dictionary'})
-            self.assertEqual(self.app.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'})
-            self.assertTrue(self.app.make('Broadcast').ssl(True).ssl_message)
+            self.container.bind('Broadcast', self.container.make('BroadcastManager').driver('ably'))
+
+            self.assertIsNotNone(self.container.make('BroadcastManager'))
+            self.assertEqual(self.container.make('Broadcast').channel('test-channel', 'from driver'), 'from driver')
+            self.assertEqual(self.container.make('Broadcast').channel('test-channel', {'message': 'from driver'}), {'message': 'from driver'})
+            self.assertEqual(self.container.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}), {'message': 'dictionary'})
+            self.assertEqual(self.container.make('Broadcast').channel(['channel-1', 'channel-2'], {'message': 'dictionary'}, 'test-event'), {'message': 'dictionary'})
+            self.assertTrue(self.container.make('Broadcast').ssl(True).ssl_message)
diff --git a/tests/core/test_app.py b/tests/core/test_app.py
index b473d9d3b..36db26fd5 100644
--- a/tests/core/test_app.py
+++ b/tests/core/test_app.py
@@ -1,6 +1,6 @@
 from src.masonite.app import App
 from src.masonite.request import Request
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 import unittest
 
 REQUEST = Request({}).load_environ(generate_wsgi())
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 667fc4025..91f782860 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -13,7 +13,7 @@
 from app.http.controllers.ConfirmController import \
     ConfirmController
 from src.masonite.testing import TestCase
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 from src.masonite.view import View
 
 
diff --git a/tests/core/test_cookie_signing.py b/tests/core/test_cookie_signing.py
index b5db056f8..4d8b6945f 100644
--- a/tests/core/test_cookie_signing.py
+++ b/tests/core/test_cookie_signing.py
@@ -1,5 +1,5 @@
 from src.masonite.request import Request
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 import unittest
 
 
diff --git a/tests/core/test_exception.py b/tests/core/test_exception.py
index 6412c5170..82ea36836 100644
--- a/tests/core/test_exception.py
+++ b/tests/core/test_exception.py
@@ -3,7 +3,7 @@
 from src.masonite.hook import Hook
 from src.masonite.request import Request
 from src.masonite.response import Response
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 from src.masonite.view import View
 import unittest
 
diff --git a/tests/core/test_extends.py b/tests/core/test_extends.py
index 04484044e..b96923a17 100644
--- a/tests/core/test_extends.py
+++ b/tests/core/test_extends.py
@@ -1,5 +1,5 @@
 from src.masonite.app import App
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 from src.masonite.routes import Route
 from src.masonite.request import Request
 
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index c42ef392b..022d3146a 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -4,36 +4,32 @@
 from src.masonite.app import App
 from src.masonite.helpers import config
 from src.masonite.routes import Get
-from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.testing import TestCase, generate_wsgi
 
 
-class TestProviders(unittest.TestCase):
+class TestProviders(TestCase):
 
     def setUp(self):
-        self.app = App(remember=False)
-        self.app.bind('WSGI', object)
-
-        # self.app.bind('Providers', providers)
-        self.app.bind('Environ', generate_wsgi())
+        super().setUp()
+        self.container.bind('Environ', generate_wsgi())
 
     def test_providers_load_into_container(self):
         for provider in config('providers.providers'):
-            provider().load_app(self.app).register()
+            provider().load_app(self.container).register()
 
-        self.app.bind('Response', 'test')
-        self.app.bind('WebRoutes', [
+        self.container.bind('Response', 'test')
+        self.container.bind('WebRoutes', [
             Get().route('url', 'TestController@show'),
             Get().route('url/', 'TestController@show'),
             Get().route('url/@firstname', 'TestController@show'),
         ])
 
-        self.app.bind('Response', 'Route not found. Error 404')
+        self.container.bind('Response', 'Route not found. Error 404')
 
         for provider in config('providers.providers'):
-            self.app.resolve(provider().load_app(self.app).boot)
+            self.container.resolve(provider().load_app(self.container).boot)
 
-        self.assertTrue(self.app.make('Request'))
+        self.assertTrue(self.container.make('Request'))
 
     def test_normal_app_containers(self):
-        self.app = TestSuite().create_container()
-        self.assertTrue(self.app.get_container().make('Request'))
+        self.assertTrue(self.container.make('Request'))
diff --git a/tests/core/test_request_routes.py b/tests/core/test_request_routes.py
index 48979af13..a1670a670 100644
--- a/tests/core/test_request_routes.py
+++ b/tests/core/test_request_routes.py
@@ -1,13 +1,14 @@
 from src.masonite.routes import Get, Post
 from src.masonite.request import Request
-from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.testing import TestCase, generate_wsgi
 import unittest
 
 
-class TestRequestRoutes(unittest.TestCase):
+class TestRequestRoutes(TestCase):
 
     def setUp(self):
-        self.request = Request(generate_wsgi()).key(
+        super().setUp()
+        self.request = self.container.make('Request').load_environ(generate_wsgi()).key(
             'NCTpkICMlTXie5te9nJniMj9aVbPM6lsjeq5iDZ0dqY=')
 
         self.request.activate_subdomains()
@@ -57,38 +58,36 @@ def test_method_type_has_required_subdomain(self):
         self.assertEqual(post.has_required_domain(), True)
 
     def test_method_type_has_required_subdomain_with_asterick(self):
-        container = TestSuite().create_container()
-        request = container.container.make('Request')
+        
 
-        request.environ['HTTP_HOST'] = 'test.localhost:8000'
+        self.request.environ['HTTP_HOST'] = 'test.localhost:8000'
 
-        request.activate_subdomains()
+        self.request.activate_subdomains()
 
         get = Get().domain('*')
         post = Get().domain('*')
 
-        get.request = request
-        post.request = request
+        get.request = self.request
+        post.request = self.request
 
         self.assertEqual(get.has_required_domain(), True)
         self.assertEqual(post.has_required_domain(), True)
 
     def test_request_sets_subdomain_on_get(self):
-        container = TestSuite().create_container()
-        request = container.container.make('Request')
+        
 
-        request.environ['HTTP_HOST'] = 'test.localhost:8000'
+        self.request.environ['HTTP_HOST'] = 'test.localhost:8000'
 
-        request.activate_subdomains()
+        self.request.activate_subdomains()
 
         get = Get().domain('*')
         post = Get().domain('*')
 
-        get.request = request
-        post.request = request
+        get.request = self.request
+        post.request = self.request
 
         get.has_required_domain()
-        self.assertEqual(request.param('subdomain'), 'test')
+        self.assertEqual(self.request.param('subdomain'), 'test')
 
     def test_route_changes_module_location(self):
         get = Get().module('app.test')
diff --git a/tests/core/test_requests.py b/tests/core/test_requests.py
index 19e9a4a30..76ac5c42b 100644
--- a/tests/core/test_requests.py
+++ b/tests/core/test_requests.py
@@ -12,7 +12,7 @@
 from src.masonite.request import Request
 from src.masonite.response import Response
 from src.masonite.routes import Get, RouteGroup
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 
 WEB_ROUTES = flatten_routes([
     Get('/test', 'Controller@show').name('test'),
diff --git a/tests/core/test_routes.py b/tests/core/test_routes.py
index ed6b9af0d..8fd4a39e4 100644
--- a/tests/core/test_routes.py
+++ b/tests/core/test_routes.py
@@ -10,8 +10,7 @@
 from src.masonite.routes import (Connect, Delete, Get, Head, Match, Options,
                                  Patch, Post, Put, Redirect, Route, RouteGroup,
                                  Trace)
-from src.masonite.testing import TestCase
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import TestCase, generate_wsgi
 from src.masonite.exceptions import RouteNotFoundException
 
 class TestRoutes(unittest.TestCase):
diff --git a/tests/core/test_service_provider.py b/tests/core/test_service_provider.py
index 6eb99c54d..961bafd92 100644
--- a/tests/core/test_service_provider.py
+++ b/tests/core/test_service_provider.py
@@ -4,7 +4,7 @@
 from src.masonite.provider import ServiceProvider
 from src.masonite.request import Request
 from src.masonite.routes import Get
-from src.masonite.testsuite.TestSuite import TestSuite, generate_wsgi
+from src.masonite.testing import TestCase, generate_wsgi
 
 
 class ContainerTest(ServiceProvider):
@@ -19,7 +19,7 @@ def testboot(self, request: Request, get: Get):
 class ServiceProviderTest(ServiceProvider):
 
     def register(self):
-        self.app.bind('Request', object)
+        self.container.bind('Request', object)
 
 
 class Mock1Command:
@@ -61,60 +61,60 @@ def boot(self):
         self.commands(Mock1Command(), Mock2Command())
 
 
-class TestServiceProvider(unittest.TestCase):
+class TestServiceProvider(TestCase):
 
     def setUp(self):
-        self.app = TestSuite().create_container().container
-        self.app.resolve_parameters = True
+        super().setUp()
+        self.container.resolve_parameters = True
         self.provider = ServiceProvider()
-        self.provider.load_app(self.app).register()
+        self.provider.load_app(self.container).register()
         self.load_provider = LoadProvider()
-        self.load_provider.load_app(self.app).boot()
+        self.load_provider.load_app(self.container).boot()
 
     def test_service_provider_loads_app(self):
-        self.assertEqual(self.provider.app, self.app)
+        self.assertEqual(self.provider.app, self.container)
 
     def test_can_call_container_with_self_parameter(self):
-        self.app.bind('Request', Request({}))
-        self.app.bind('Get', Get())
+        self.container.bind('Request', Request({}))
+        self.container.bind('Get', Get())
 
-        self.assertEqual(self.app.resolve(ContainerTest().boot), self.app.make('Request'))
+        self.assertEqual(self.container.resolve(ContainerTest().boot), self.container.make('Request'))
 
     def test_can_call_container_with_annotations_from_variable(self):
         request = Request(generate_wsgi())
 
-        self.app.bind('Request', request)
-        self.app.bind('Get', Get().route('url', None))
+        self.container.bind('Request', request)
+        self.container.bind('Get', Get().route('url', None))
 
-        self.assertEqual(self.app.resolve(ContainerTest().testboot), self.app.make('Request'))
+        self.assertEqual(self.container.resolve(ContainerTest().testboot), self.container.make('Request'))
 
     def test_can_load_routes_into_container(self):
-        self.assertTrue(len(self.app.make('WebRoutes')) > 2)
-        self.assertEqual(self.app.make('WebRoutes')[-2:], [ROUTE1, ROUTE2])
+        self.assertTrue(len(self.container.make('WebRoutes')) > 2)
+        self.assertEqual(self.container.make('WebRoutes')[-2:], [ROUTE1, ROUTE2])
 
     def test_can_load_http_middleware_into_container(self):
-        self.assertEqual(self.app.make('HttpMiddleware')[-2:], [object, object])
+        self.assertEqual(self.container.make('HttpMiddleware')[-2:], [object, object])
 
     def test_can_load_route_middleware_into_container(self):
-        self.assertEqual(self.app.make('RouteMiddleware')['route1'], object)
-        self.assertEqual(self.app.make('RouteMiddleware')['route2'], object)
+        self.assertEqual(self.container.make('RouteMiddleware')['route1'], object)
+        self.assertEqual(self.container.make('RouteMiddleware')['route2'], object)
 
     def test_can_load_migrations_into_container(self):
-        self.assertEqual(len(self.app.collect('*MigrationDirectory')), 2)
+        self.assertEqual(len(self.container.collect('*MigrationDirectory')), 12)
 
     def test_can_load_assets_into_container(self):
-        self.assertEqual(self.app.make('staticfiles')['storage/static'], '/some/location')
+        self.assertEqual(self.container.make('staticfiles')['storage/static'], '/some/location')
 
     def test_can_load_commands_into_container(self):
-        self.assertTrue(self.app.make('Mock1Command'))
-        self.assertTrue(self.app.make('Mock2Command'))
+        self.assertTrue(self.container.make('Mock1Command'))
+        self.assertTrue(self.container.make('Mock2Command'))
 
     def test_can_load_publishing(self):
         self.load_provider.publishes({
             'from/directory': 'to/directory'
         })
         self.assertEqual(self.load_provider._publishes, {'from/directory': 'to/directory'})
-        # self.assertTrue(self.app.make('Mock2Command'))
+        # self.assertTrue(self.container.make('Mock2Command'))
 
     def test_provider_can_publish_with_tags(self):
         self.load_provider.publishes({
diff --git a/tests/core/test_session.py b/tests/core/test_session.py
index 9b98e8cdb..5bdc51bbc 100644
--- a/tests/core/test_session.py
+++ b/tests/core/test_session.py
@@ -4,25 +4,20 @@
 from src.masonite.drivers import SessionCookieDriver, SessionMemoryDriver
 from src.masonite.managers import SessionManager
 from src.masonite.request import Request
-from src.masonite.testsuite.TestSuite import generate_wsgi
+from src.masonite.testing import generate_wsgi, TestCase
 
-
-class TestSession(unittest.TestCase):
+class TestSession(TestCase):
 
     def setUp(self):
-        wsgi_request = generate_wsgi()
-        self.app = App()
-        self.app.bind('Environ', wsgi_request)
-        self.app.bind('Request', Request(wsgi_request))
-        # self.app.bind('SessionConfig', session)
-        self.app.bind('SessionCookieDriver', SessionCookieDriver)
-        self.app.bind('SessionMemoryDriver', SessionMemoryDriver)
-        self.app.bind('SessionManager', SessionManager(self.app))
-        self.app.bind('Application', self.app)
+        super().setUp()
+        self.container.make('Request').load_environ(generate_wsgi())
+        self.container.bind('SessionMemoryDriver', SessionMemoryDriver)
+        self.container.bind('SessionCookieDriver', SessionCookieDriver)
+        self.container.bind('SessionManager', SessionManager(self.container))
 
     def test_session_request(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session.set('username', 'pep')
             session.set('password', 'secret')
             self.assertEqual(session.get('username'), 'pep')
@@ -30,22 +25,22 @@ def test_session_request(self):
 
     def test_session_has_no_data(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session._flash = {}
             self.assertFalse(session.has('nodata'))
 
     def test_change_ip_address(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
-            session.environ['REMOTE_ADDR'] = '111.222.33.44'
+            session = self.container.make('SessionManager').driver(driver)
+            session.request.environ['REMOTE_ADDR'] = '111.222.33.44'
             session.set('username', 'pep')
             self.assertEqual(session.get('username'), 'pep')
 
     def test_session_get_all_data(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
-            session.environ['REMOTE_ADDR'] = 'get.all.data'
+            session = self.container.make('SessionManager').driver(driver)
+            session.request.environ['REMOTE_ADDR'] = 'get.all.data'
             session.set('username', 'pep')
             session.flash('password', 'secret')
 
@@ -53,7 +48,7 @@ def test_session_get_all_data(self):
 
     def test_session_has_data(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session._flash = {}
             session.set('username', 'pep')
@@ -62,7 +57,7 @@ def test_session_has_data(self):
 
     def test_session_helper(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session._flash = {}
             helper = session.helper
@@ -71,7 +66,7 @@ def test_session_helper(self):
 
     def test_session_flash_data(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session.flash('flash_username', 'pep')
             session.flash('flash_password', 'secret')
@@ -79,13 +74,13 @@ def test_session_flash_data(self):
             self.assertEqual(session.get('flash_password'), 'secret')
 
     def test_reset_flash_session_memory(self):
-        session = self.app.make('SessionManager').driver('memory')
+        session = self.container.make('SessionManager').driver('memory')
         session.flash('flash_', 'test_pep')
         session.reset(flash_only=True)
         self.assertIsNone(session.get('flash_'))
 
     def test_reset_flash_session_driver(self):
-        session = self.app.make('SessionManager').driver('cookie')
+        session = self.container.make('SessionManager').driver('cookie')
         session.flash('flash_', 'test_pep')
 
         session.reset(flash_only=True)
@@ -93,7 +88,7 @@ def test_reset_flash_session_driver(self):
 
     def test_session_flash_data_serializes_dict(self):
         for driver in ('cookie', 'memory'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session.flash('flash_dict', {'id': 1})
             session.set('get_dict', {'id': 1})
@@ -102,21 +97,21 @@ def test_session_flash_data_serializes_dict(self):
 
     def test_session_flash_data_serializes_list(self):
         for driver in ('cookie', 'memory'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session._session = {}
             session.flash('flash_dict', [1, 2, 3])
             self.assertEqual(session.get('flash_dict'), [1, 2, 3])
 
     def test_reset_serializes_dict(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session.set('flash_', 'test_pep')
             session.reset()
             self.assertIsNone(session.get('reset_username'))
 
     def test_delete_session(self):
         for driver in ('memory', 'cookie'):
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             session.set('test1', 'value')
             session.set('test2', 'value')
             self.assertTrue(session.delete('test1'))
@@ -125,12 +120,12 @@ def test_delete_session(self):
 
     def test_can_redirect_with_inputs(self):
         for driver in ('memory', 'cookie'):
-            request = self.app.make('Request')
+            request = self.container.make('Request')
             request.request_variables = {
                 'key1': 'val1',
                 'key2': 'val2',
             }
             request.with_input()
-            session = self.app.make('SessionManager').driver(driver)
+            session = self.container.make('SessionManager').driver(driver)
             self.assertFalse(session.has('key1'))
             self.assertFalse(session.has('key2'))
diff --git a/tests/helpers/test_view_helpers.py b/tests/helpers/test_view_helpers.py
index f8a278397..14f936664 100644
--- a/tests/helpers/test_view_helpers.py
+++ b/tests/helpers/test_view_helpers.py
@@ -4,7 +4,7 @@
 from src.masonite.app import App
 from src.masonite.providers import HelpersProvider
 from src.masonite.request import Request
-from src.masonite.testsuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 from src.masonite.view import View
 
 
diff --git a/tests/middleware/test_cors_middleware.py b/tests/middleware/test_cors_middleware.py
index 53a9dabb1..a7f7847a8 100644
--- a/tests/middleware/test_cors_middleware.py
+++ b/tests/middleware/test_cors_middleware.py
@@ -1,18 +1,17 @@
 from src.masonite.middleware import CorsMiddleware
 from src.masonite.request import Request
-from src.masonite.testsuite import generate_wsgi, TestSuite
+from src.masonite.testing import generate_wsgi, TestCase
 
 import unittest
 
 
-class TestCorsMiddleware(unittest.TestCase):
+class TestCorsMiddleware(TestCase):
 
     def setUp(self):
-        self.request = Request(generate_wsgi())
-        self.middleware = CorsMiddleware(self.request)
-        self.app = TestSuite().create_container().container
-        self.app.bind('Request', self.request.load_app(self.app))
-        self.request = self.app.make('Request')
+        super().setUp()
+        self.container.bind('Request', Request(generate_wsgi()).load_app(self.container))
+        self.request = self.container.make('Request')
+        self.middleware = self.container.resolve(CorsMiddleware)
 
     def test_secure_headers_middleware(self):
         self.middleware.CORS = {"Access-Control-Allow-Origin": "*"}
diff --git a/tests/middleware/test_csrf_middleware.py b/tests/middleware/test_csrf_middleware.py
index b04ea681e..f65c82724 100644
--- a/tests/middleware/test_csrf_middleware.py
+++ b/tests/middleware/test_csrf_middleware.py
@@ -3,35 +3,36 @@
 from src.masonite.auth.Csrf import Csrf
 from src.masonite.app import App
 from src.masonite.middleware import CsrfMiddleware
-from src.masonite.testsuite.TestSuite import generate_wsgi
 from src.masonite.exceptions import InvalidCSRFToken
 from src.masonite.routes import Get, Route
 import unittest
+from src.masonite.testing import TestCase, generate_wsgi
 
 
-class TestCSRFMiddleware(unittest.TestCase):
+class TestCSRFMiddleware(TestCase):
 
     def setUp(self):
-        self.app = App()
+        super().setUp()
         wsgi = generate_wsgi()
-        self.request = Request(wsgi)
-        self.route = Route().load_environ(wsgi)
-        self.view = View(self.app)
-        self.app.bind('Request', self.request)
-
-        self.request = self.app.make('Request')
-        self.app.bind('WebRoutes', [
+        # self.request = Request(wsgi)
+        # self.route = Route().load_environ(wsgi)
+        # self.view = View(self.container)
+        # self.container.bind('Request', self.request)
+
+        self.request = self.container.make('Request')
+        self.request.load_environ(wsgi)
+        self.routes(only=[
             Get().route('/test/@route', None),
             Get().route('/test/10', None),
         ])
-        self.request.container = self.app
 
-        self.middleware = CsrfMiddleware(self.request, Csrf(self.request), self.view)
+
+        self.middleware = self.container.resolve(CsrfMiddleware)
 
     def test_middleware_shares_correct_input(self):
         self.middleware.before()
-        self.assertIn('csrf_field', self.view._shared)
-        self.assertTrue(self.view._shared['csrf_field'].startswith("<input type='hidden' name='__token' value='"))
+        self.assertIn('csrf_field', self.container.make('ViewClass')._shared)
+        self.assertTrue(self.container.make('ViewClass')._shared['csrf_field'].startswith("<input type='hidden' name='__token' value='"))
 
     def test_middleware_throws_exception_on_post(self):
         self.request.environ['REQUEST_METHOD'] = 'POST'
@@ -75,6 +76,9 @@ def test_generates_csrf_token(self):
         self.assertTrue(len(self.middleware.generate_token()) == 30)
 
     def test_generates_token_every_request(self):
+        csrf = CsrfMiddleware
+        csrf.every_request = True
+        self.middleware = self.container.resolve(csrf)
         token1 = self.middleware.verify_token()
         token2 = self.middleware.verify_token()
 
@@ -83,6 +87,9 @@ def test_generates_token_every_request(self):
         self.assertNotEqual(token1, token2)
 
     def test_does_not_generate_token_every_request(self):
+        csrf = CsrfMiddleware
+        csrf.every_request = False
+        self.middleware = self.container.resolve(csrf)
         self.middleware.every_request = False
         token1 = self.middleware.verify_token()
         token2 = self.middleware.verify_token()
diff --git a/tests/middleware/test_maintenance_mode_middleware.py b/tests/middleware/test_maintenance_mode_middleware.py
index b05dad6d3..e8c1082a6 100644
--- a/tests/middleware/test_maintenance_mode_middleware.py
+++ b/tests/middleware/test_maintenance_mode_middleware.py
@@ -4,7 +4,7 @@
 from src.masonite.app import App
 from src.masonite.request import Request
 from src.masonite.middleware import MaintenanceModeMiddleware
-from src.masonite.testsuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 
 from config import application
 import unittest
diff --git a/tests/middleware/test_secure_headers_middleware.py b/tests/middleware/test_secure_headers_middleware.py
index 7780920d4..05c474ec3 100644
--- a/tests/middleware/test_secure_headers_middleware.py
+++ b/tests/middleware/test_secure_headers_middleware.py
@@ -3,17 +3,17 @@
 
 from src.masonite.middleware import SecureHeadersMiddleware
 from src.masonite.request import Request
-from src.masonite.testsuite import TestSuite, generate_wsgi
+from src.masonite.testing import TestCase, generate_wsgi
 
 
-class TestSecureHeadersMiddleware(unittest.TestCase):
+class TestSecureHeadersMiddleware(TestCase):
 
     def setUp(self):
+        super().setUp()
         self.request = Request(generate_wsgi())
         self.middleware = SecureHeadersMiddleware(self.request)
-        self.app = TestSuite().create_container().container
-        self.app.bind('Request', self.request.load_app(self.app))
-        self.request = self.app.make('Request')
+        self.container.bind('Request', self.request.load_app(self.container))
+        self.request = self.container.make('Request')
 
     def test_secure_headers_middleware(self):
         self.middleware.after()
@@ -21,6 +21,6 @@ def test_secure_headers_middleware(self):
         self.assertEqual(self.request.header('X-Frame-Options'), 'SAMEORIGIN')
 
     def test_secure_headers_gets_middleware_from_the_config(self):
-        self.request = self.app.make('Request')
+        self.request = self.container.make('Request')
         self.middleware.after()
         self.assertEqual(self.request.header('X-Content-Type-Options'), 'sniff-test')
diff --git a/tests/providers/test_statuscode_provider.py b/tests/providers/test_statuscode_provider.py
index 170703664..0e156a654 100644
--- a/tests/providers/test_statuscode_provider.py
+++ b/tests/providers/test_statuscode_provider.py
@@ -4,7 +4,7 @@
 from src.masonite.view import View
 from src.masonite.app import App
 from src.masonite.providers.StatusCodeProvider import ServerErrorExceptionHook
-from src.masonite.testsuite import generate_wsgi
+from src.masonite.testing import generate_wsgi
 import unittest
 
 
diff --git a/tests/storage/test_storage_manager.py b/tests/storage/test_storage_manager.py
index b1bc89616..be86ca78b 100644
--- a/tests/storage/test_storage_manager.py
+++ b/tests/storage/test_storage_manager.py
@@ -1,20 +1,20 @@
 import os
 import unittest
 
-from src.masonite.testsuite import TestSuite
+from src.masonite.testing import TestCase
 from src.masonite.managers import StorageManager
 from src.masonite.drivers import StorageDiskDriver
 from config import storage
 
 
-class TestStorage(unittest.TestCase):
+class TestStorage(TestCase):
 
     def setUp(self):
-        self.app = TestSuite().create_container().container
-        self.app.bind('StorageDiskDriver', StorageDiskDriver)
-        self.app.bind('StorageManager', StorageManager(self.app))
-        self.app.bind('Storage', StorageManager(self.app).driver(storage.DRIVER))
-        self.manager = self.app.make('Storage')
+        super().setUp()
+        self.container.bind('StorageDiskDriver', StorageDiskDriver)
+        self.container.bind('StorageManager', StorageManager(self.container))
+        self.container.bind('Storage', StorageManager(self.container).driver(storage.DRIVER))
+        self.manager = self.container.make('Storage')
 
     def test_storage_creates_disk_driver(self):
         self.assertIsInstance(self.manager.driver('disk'), StorageDiskDriver)

From 0632a45490e1e6ec5d0273f7764559743fbb96a5 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 12:28:59 -0400
Subject: [PATCH 48/59] fixed circleci orb

---
 .circleci/config.yml | 2 +-
 setup.py             | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d27db24f2..292183bb4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,7 +56,7 @@ jobs:
         - run: make deepsource
 
 orbs:
-    masonite: masonite/trigger@dev:latest
+    masonite: masonite/trigger@1.0.0
 
 workflows: 
   version: 2
diff --git a/setup.py b/setup.py
index dd3594d89..a45a65321 100644
--- a/setup.py
+++ b/setup.py
@@ -47,9 +47,6 @@
         'cryptography>=2.3,<2.8',
         'hupper>=1.0,<2.0',
         'Jinja2>=2,<3',
-        # 'masonite-events>=1.0,<2',
-        # 'masonite-scheduler>=1.0.0,<=1.0.99',
-        # 'masonite-validation>=3.0.0,<4.0.0',
         'orator>=0.9,<1',
         'passlib>=1.7,<1.8',
         'pendulum>=1.5,<1.6',

From 6865b7cd5940f9a7785eee1b97dee34d28e21c1b Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 14:30:58 -0400
Subject: [PATCH 49/59] added base authentication guard

---
 src/masonite/auth/guards/APIGuard.py          |   0
 .../auth/guards/AuthenticationGuard.py        |  56 ++++++++++
 src/masonite/auth/guards/Guard.py             | 102 ++++++++++++++++--
 src/masonite/auth/guards/WebGuard.py          |  25 +----
 src/masonite/auth/guards/__init__.py          |   3 +-
 tests/core/test_auth.py                       |   5 +-
 6 files changed, 157 insertions(+), 34 deletions(-)
 delete mode 100644 src/masonite/auth/guards/APIGuard.py
 create mode 100644 src/masonite/auth/guards/AuthenticationGuard.py

diff --git a/src/masonite/auth/guards/APIGuard.py b/src/masonite/auth/guards/APIGuard.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/masonite/auth/guards/AuthenticationGuard.py b/src/masonite/auth/guards/AuthenticationGuard.py
new file mode 100644
index 000000000..b2a06bd03
--- /dev/null
+++ b/src/masonite/auth/guards/AuthenticationGuard.py
@@ -0,0 +1,56 @@
+
+class AuthenticationGuard:
+
+    def guard(self, guard):
+        """Specify the guard you want to use
+        
+        Arguments:
+            guard {[type]} -- [description]
+        """
+        from .Guard import Guard
+        return Guard(self.app).make(guard)
+
+    def register_guard(self, key, cls=None):
+        """Registers a new guard class.
+
+        Arguments:
+            key {string|dict} -- The key to name the guard to a dictionary of key: values
+
+        Keyword Arguments:
+            cls {object} -- A guard class. (default: {None})
+
+        Returns:
+            None
+        """
+        from .Guard import Guard
+        if isinstance(key, dict):
+            return Guard.guards.update(key)
+
+        return Guard.guards.update({key: cls})
+
+    def register_driver(self, key, cls):
+        """Registers a new driver with the current guard class.
+        
+        Arguments:
+            key {string} -- The key to register the driver to.
+            cls {class} -- A guard class.
+        """
+        self.drivers.update({key: cls})
+
+    def make(self, key):
+        """Makes a new driver from the current guard class.
+        
+        Arguments:
+            key {string} -- The key to for the driver to make.
+        
+        Raises:
+            DriverNotFound: Thrown when the driver is not registered.
+        
+        Returns:
+            object -- Returns a guard driver object.
+        """
+        if key in self.drivers:
+            self.driver = self.app.resolve(self.drivers[key])
+            return self.driver
+
+        raise DriverNotFound("Could not find the driver {}".format(key))
diff --git a/src/masonite/auth/guards/Guard.py b/src/masonite/auth/guards/Guard.py
index 356e22936..e0d1ba3bd 100644
--- a/src/masonite/auth/guards/Guard.py
+++ b/src/masonite/auth/guards/Guard.py
@@ -1,42 +1,124 @@
-from .WebGuard import WebGuard
-from ...helpers import config
+"""A Guard Class Module."""
 from ...app import App
+from ...exceptions import DriverNotFound
+
 
 class Guard:
 
     guards = {}
 
     def __init__(self, app: App):
-        self.app = app
+        """Guard Initializer
 
-    def register(self, key, cls):
-        self.guards.update({key: cls})
+        Arguments:
+            app {masonite.app.App} -- The Masonite container
+        """
+        self.app = app
 
     def make(self, key):
+        """Makes a guard that has been previously registered
+
+        Arguments:
+            key {string} -- The key of the guard to fetch.
+
+        Raises:
+            DriverNotFound: Raised when trying to fetch a guard that has not been registered yet.
+
+        Returns:
+            [type] -- [description]
+        """
         if key in self.guards:
             self._guard = self.app.resolve(self.guards[key])
             return self._guard
 
+        raise DriverNotFound("Could not find the guard: '{}'".format(key))
+
+    def guard(self, key):
+        """Alias for the make method.
+
+        Arguments:
+            key {string} -- The key of the guard to fetch.
+
+        Returns:
+            masonite.guards.* -- An instance of a guard class.
+        """
+        return self.make(key)
+
     def set(self, key):
+        """Sets the specified guard as the default guard to use.
+
+        Arguments:
+            key {string} -- The key of the guard to set.
+
+        Returns:
+            masonite.guards.* -- An instance of guard class.
+        """
         return self.make(key)
 
     def get(self):
+        """Gets the guard current class.
+
+        Returns:
+            masonite.guards.* -- An instance of guard class.
+        """
         return self._guard
 
     def driver(self, key):
+        """Gets the driver for the currently set guard class.
+
+        Arguments:
+            key {string} -- The key of the driver for the guard to get.
+
+        Returns:
+            masonite.drivers.auth.* -- An auth driver class.
+        """
         return self._guard.make(key)
 
-    def register_guard(self, guard, cls):
-        self.guards.update({guard: cls})
+    def register_guard(self, key, cls=None):
+        """Registers a new guard class.
+
+        Arguments:
+            key {string|dict} -- The key to name the guard to a dictionary of key: values
+
+        Keyword Arguments:
+            cls {object} -- A guard class. (default: {None})
+
+        Returns:
+            None
+        """
+        if isinstance(key, dict):
+            return self.guards.update(key)
+
+        return self.guards.update({key: cls})
 
     def login(self, *args, **kwargs):
+        """Wrapper method to call the guard class method.
+
+        Returns:
+            * -- Returns what the guard class method returns.
+        """
         return self._guard.login(*args, **kwargs)
-    
+
     def user(self, *args, **kwargs):
+        """Wrapper method to call the guard class method.
+
+        Returns:
+            * -- Returns what the guard class method returns.
+        """
         return self._guard.user(*args, **kwargs)
-    
+
     def register(self, *args, **kwargs):
+        """Wrapper method to call the guard class method.
+
+        Returns:
+            * -- Returns what the guard class method returns.
+        """
         return self._guard.register(*args, **kwargs)
-    
+
     def __getattr__(self, key, *args, **kwargs):
+        """Wrapper method to call the guard class methods.
+
+        Returns:
+            * -- Returns what the guard class methods returns.
+        """
         return getattr(self._guard, key)
diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
index 1fca8eac0..c0b5634d2 100644
--- a/src/masonite/auth/guards/WebGuard.py
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -7,9 +7,10 @@
 from ...drivers import AuthCookieDriver, AuthJwtDriver
 from ...helpers import config
 from ...helpers import password as bcrypt_password
+from ...exceptions import DriverNotFound
+from .AuthenticationGuard import AuthenticationGuard
 
-
-class WebGuard:
+class WebGuard(AuthenticationGuard):
 
     drivers = {
         'cookie': AuthCookieDriver,
@@ -23,26 +24,6 @@ def __init__(self, app: App, request: Request, driver=None, auth_model=None):
         self.auth_model = auth_model or config('auth.auth.guards.web.model')
         self.driver = self.make(driver or config('auth.auth.guards.web.driver'))
 
-    def guard(self, guard):
-        """Specify the guard you want to use
-        
-        Arguments:
-            guard {[type]} -- [description]
-        """
-        from .Guard import Guard
-        return Guard(self.app).make(guard)
-
-    def register_driver(self, key, cls):
-        self.drivers.update({key: cls})
-
-    def register_guard(self, key, cls):
-        from .Guard import Guard
-        return Guard.guards.update({key: cls})
-
-    def make(self, key):
-        if key in self.drivers:
-            self.driver = self.app.resolve(self.drivers[key])
-            return self.driver
 
     def user(self):
         """Get the currently logged in user.
diff --git a/src/masonite/auth/guards/__init__.py b/src/masonite/auth/guards/__init__.py
index b89a69741..11d537565 100644
--- a/src/masonite/auth/guards/__init__.py
+++ b/src/masonite/auth/guards/__init__.py
@@ -1,2 +1,3 @@
 from .Guard import Guard
-from .WebGuard import WebGuard
\ No newline at end of file
+from .AuthenticationGuard import AuthenticationGuard
+from .WebGuard import WebGuard
diff --git a/tests/core/test_auth.py b/tests/core/test_auth.py
index 394d9a2d8..c190451e7 100644
--- a/tests/core/test_auth.py
+++ b/tests/core/test_auth.py
@@ -6,7 +6,7 @@
 from src.masonite.app import App
 from src.masonite.auth import Auth, MustVerifyEmail, Sign
 from src.masonite.auth.guards import Guard, WebGuard
-from src.masonite.drivers import AuthCookieDriver, AuthJwtDriver
+from src.masonite.drivers import AuthJwtDriver
 from src.masonite.helpers import password as bcrypt_password
 from src.masonite.routes import Get
 from src.masonite.request import Request
@@ -42,7 +42,9 @@ def setUp(self):
 
         self.auth = Guard(self.app)
         self.auth.register_guard('web', WebGuard)
+        self.auth.guard('web').register_driver('jwt', AuthJwtDriver)
         self.auth.set('web')
+
         self.app.swap(Auth, self.auth)
         self.request.load_app(self.app)
 
@@ -156,6 +158,7 @@ def test_login_once_does_not_set_cookie(self):
 
     def test_confirm_controller_success(self):
         for driver in ('jwt', 'cookie'):
+            self.auth.driver(driver)
             params = {'id': Sign().sign('{0}::{1}'.format(1, time.time()))}
             self.request.set_params(params)
             user = self.auth.once().login_by_id(1)

From 8582535d7d23c01d5f5c13474080dfdb34a405a2 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 14:40:06 -0400
Subject: [PATCH 50/59] added comments

---
 .deepsource.toml                           |  4 ++--
 Makefile                                   |  4 ++--
 src/masonite/middleware/GuardMiddleware.py | 12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.deepsource.toml b/.deepsource.toml
index fff2d73c3..8271570e0 100644
--- a/.deepsource.toml
+++ b/.deepsource.toml
@@ -3,8 +3,8 @@ version = 1
 
 test_patterns = [
   'tests/**/*.py',
-  'masonite/testing/*.py',
-  'masonite/testsuite/*.py',
+  'src/masonite/testing/*.py',
+  'src/masonite/testsuite/*.py',
   'testpackage/*.py'
 ]
 
diff --git a/Makefile b/Makefile
index 8819192d8..e03e5722b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ ci:
 	make test
 	make lint
 lint:
-	python -m flake8 masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
+	python -m flake8 src/masonite/ --ignore=E501,F401,E128,E402,E731,F821,E712,W503
 deepsource:
 	curl https://deepsource.io/cli | sh
 	./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml
 coverage:
-	python -m pytest --cov-report term --cov-report xml --cov=masonite tests/
+	python -m pytest --cov-report term --cov-report xml --cov=src/masonite tests/
 	python -m coveralls
 publish:
 	pip install 'twine>=1.5.0'
diff --git a/src/masonite/middleware/GuardMiddleware.py b/src/masonite/middleware/GuardMiddleware.py
index 525df969d..dbb826f26 100644
--- a/src/masonite/middleware/GuardMiddleware.py
+++ b/src/masonite/middleware/GuardMiddleware.py
@@ -10,7 +10,17 @@ def __init__(self, auth: Auth):
         self.auth = auth
 
     def before(self, guard):
+        """Sets specified guard for the request.
+        
+        Arguments:
+            guard {string} -- The key of the guard to set.
+        """
         self.auth.set(guard)
 
-    def after(self, guard):
+    def after(self, _):
+        """Sets the default guard back after the request.
+        
+        Arguments:
+            _ {ignored} -- ignored
+        """
         self.auth.set(config('auth.auth.defaults.guard'))

From cfe47492149dee1c35ba782272e859853573337f Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 14:53:27 -0400
Subject: [PATCH 51/59] fixed response exception block

---
 src/masonite/response.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/masonite/response.py b/src/masonite/response.py
index abc44327d..e02d2bb71 100644
--- a/src/masonite/response.py
+++ b/src/masonite/response.py
@@ -54,42 +54,25 @@ def paginated_json(self, paginator, status=200):
         # try to capture request input for page_size and/or page
         page_size_input = self.request.input(page_size_parameter)
         page_input = self.request.input(page_parameter)
-        # use try/except here, as int(bool) will return 0 for False above
         try:
             page_size = (
                 int(page_size_input)
                 if page_size_input and int(page_size_input) > 0
                 else paginator.per_page
             )
-        except Exception:
+        except ValueError:
             page_size = paginator.per_page
+
         try:
             page = (
                 int(page_input)
                 if page_input and int(page_input) > 0
                 else paginator.current_page
             )
-        except Exception:
+        except ValueError:
             page = paginator.current_page
 
         # don't waste time instantiating new paginator if no change
-        if (
-            page_size != paginator.per_page
-            or page != paginator.current_page
-        ):
-            try:
-                # try to get class of model
-                next(type(x) for x in paginator.items)
-                if isinstance(paginator, Paginator):
-                    paginator = model_class.simple_paginate(
-                        page_size,
-                        page
-                    )
-                elif isinstance(paginator, LengthAwarePaginator):
-                    paginator = model_class.paginate(page_size, page)
-            except Exception:
-                paginator = paginator
-
         payload = {
             'total': (
                 paginator.total

From db794210fd9a0121e1f4f64736f098ff712e7e2a Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 14:59:27 -0400
Subject: [PATCH 52/59] linted

---
 src/masonite/app.py                                  |  4 ++--
 src/masonite/auth/Auth.py                            |  1 +
 src/masonite/auth/guards/AuthenticationGuard.py      | 10 +++++-----
 src/masonite/auth/guards/WebGuard.py                 |  2 +-
 src/masonite/autoload.py                             |  2 +-
 src/masonite/drivers/authentication/AuthJwtDriver.py |  2 +-
 src/masonite/exception_handler.py                    |  2 +-
 src/masonite/managers/Manager.py                     |  4 ++--
 src/masonite/middleware/GuardMiddleware.py           |  5 +++--
 src/masonite/providers/AppProvider.py                |  6 ++----
 src/masonite/providers/StatusCodeProvider.py         |  1 +
 src/masonite/response.py                             |  1 +
 src/masonite/view.py                                 |  3 ++-
 13 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/masonite/app.py b/src/masonite/app.py
index 464c390f6..173b93ad1 100644
--- a/src/masonite/app.py
+++ b/src/masonite/app.py
@@ -3,8 +3,8 @@
 import inspect
 
 from .exceptions import (ContainerError,
-                                 MissingContainerBindingNotFound,
-                                 StrictContainerException)
+                         MissingContainerBindingNotFound,
+                         StrictContainerException)
 
 
 class App:
diff --git a/src/masonite/auth/Auth.py b/src/masonite/auth/Auth.py
index 35f610bee..9d33a0ad1 100644
--- a/src/masonite/auth/Auth.py
+++ b/src/masonite/auth/Auth.py
@@ -1,5 +1,6 @@
 """Authentication Class."""
 
+
 class Auth:
     """Facade class for the Guard class"""
     pass
diff --git a/src/masonite/auth/guards/AuthenticationGuard.py b/src/masonite/auth/guards/AuthenticationGuard.py
index b2a06bd03..9889cddab 100644
--- a/src/masonite/auth/guards/AuthenticationGuard.py
+++ b/src/masonite/auth/guards/AuthenticationGuard.py
@@ -3,7 +3,7 @@ class AuthenticationGuard:
 
     def guard(self, guard):
         """Specify the guard you want to use
-        
+
         Arguments:
             guard {[type]} -- [description]
         """
@@ -30,7 +30,7 @@ def register_guard(self, key, cls=None):
 
     def register_driver(self, key, cls):
         """Registers a new driver with the current guard class.
-        
+
         Arguments:
             key {string} -- The key to register the driver to.
             cls {class} -- A guard class.
@@ -39,13 +39,13 @@ def register_driver(self, key, cls):
 
     def make(self, key):
         """Makes a new driver from the current guard class.
-        
+
         Arguments:
             key {string} -- The key to for the driver to make.
-        
+
         Raises:
             DriverNotFound: Thrown when the driver is not registered.
-        
+
         Returns:
             object -- Returns a guard driver object.
         """
diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
index c0b5634d2..480a2ce88 100644
--- a/src/masonite/auth/guards/WebGuard.py
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -10,6 +10,7 @@
 from ...exceptions import DriverNotFound
 from .AuthenticationGuard import AuthenticationGuard
 
+
 class WebGuard(AuthenticationGuard):
 
     drivers = {
@@ -24,7 +25,6 @@ def __init__(self, app: App, request: Request, driver=None, auth_model=None):
         self.auth_model = auth_model or config('auth.auth.guards.web.model')
         self.driver = self.make(driver or config('auth.auth.guards.web.driver'))
 
-
     def user(self):
         """Get the currently logged in user.
 
diff --git a/src/masonite/autoload.py b/src/masonite/autoload.py
index fdfe2ec94..b2e324f67 100644
--- a/src/masonite/autoload.py
+++ b/src/masonite/autoload.py
@@ -9,7 +9,7 @@
 from pydoc import importlib
 
 from .exceptions import (AutoloadContainerOverwrite, ContainerError,
-                                 InvalidAutoloadPath)
+                         InvalidAutoloadPath)
 
 
 class Autoload:
diff --git a/src/masonite/drivers/authentication/AuthJwtDriver.py b/src/masonite/drivers/authentication/AuthJwtDriver.py
index ac410049e..5ae1313f4 100644
--- a/src/masonite/drivers/authentication/AuthJwtDriver.py
+++ b/src/masonite/drivers/authentication/AuthJwtDriver.py
@@ -92,4 +92,4 @@ def delete(self):
 
     def logout(self):
         self.delete()
-        self.request.reset_user()
\ No newline at end of file
+        self.request.reset_user()
diff --git a/src/masonite/exception_handler.py b/src/masonite/exception_handler.py
index 506ea2ea5..ab20f1720 100644
--- a/src/masonite/exception_handler.py
+++ b/src/masonite/exception_handler.py
@@ -125,7 +125,7 @@ def handle(self, exception):
                                                    'enumerate': enumerate,
                                                    'open': open,
                                                    'platform': platform
-                                               }
+        }
         ))
 
 
diff --git a/src/masonite/managers/Manager.py b/src/masonite/managers/Manager.py
index 76c76c083..bd641da15 100644
--- a/src/masonite/managers/Manager.py
+++ b/src/masonite/managers/Manager.py
@@ -3,8 +3,8 @@
 import inspect
 
 from ..exceptions import (DriverNotFound,
-                                 MissingContainerBindingNotFound,
-                                 UnacceptableDriverType)
+                          MissingContainerBindingNotFound,
+                          UnacceptableDriverType)
 
 from ..app import App
 from ..helpers import config
diff --git a/src/masonite/middleware/GuardMiddleware.py b/src/masonite/middleware/GuardMiddleware.py
index dbb826f26..5e2722b1a 100644
--- a/src/masonite/middleware/GuardMiddleware.py
+++ b/src/masonite/middleware/GuardMiddleware.py
@@ -3,6 +3,7 @@
 from ..auth import Auth
 from ..helpers import config
 
+
 class GuardMiddleware:
     """Middleware to switch the guard"""
 
@@ -11,7 +12,7 @@ def __init__(self, auth: Auth):
 
     def before(self, guard):
         """Sets specified guard for the request.
-        
+
         Arguments:
             guard {string} -- The key of the guard to set.
         """
@@ -19,7 +20,7 @@ def before(self, guard):
 
     def after(self, _):
         """Sets the default guard back after the request.
-        
+
         Arguments:
             _ {ignored} -- ignored
         """
diff --git a/src/masonite/providers/AppProvider.py b/src/masonite/providers/AppProvider.py
index ddc331650..9b173ff28 100644
--- a/src/masonite/providers/AppProvider.py
+++ b/src/masonite/providers/AppProvider.py
@@ -33,7 +33,6 @@ def register(self):
         self.app.bind('ExceptionHandler', ExceptionHandler(self.app))
         self.app.bind('ExceptionDumpExceptionHandler', DumpHandler)
 
-
         self.app.bind('RouteMiddleware', config('middleware.route_middleware'))
         self.app.bind('HttpMiddleware', config('middleware.http_middleware'))
         self.app.bind('staticfiles', config('storage.staticfiles', {}))
@@ -79,8 +78,7 @@ def _load_commands(self):
             ServeCommand(),
             SeedCommand(),
             SeedRunCommand(),
-            TestCommand(), 
-            TinkerCommand(), 
+            TestCommand(),
+            TinkerCommand(),
             UpCommand()
         )
-
diff --git a/src/masonite/providers/StatusCodeProvider.py b/src/masonite/providers/StatusCodeProvider.py
index 5cc5fdf7c..06f8971d6 100644
--- a/src/masonite/providers/StatusCodeProvider.py
+++ b/src/masonite/providers/StatusCodeProvider.py
@@ -4,6 +4,7 @@
 from ..provider import ServiceProvider
 from ..helpers import config
 
+
 class ServerErrorExceptionHook:
 
     def load(self, app):
diff --git a/src/masonite/response.py b/src/masonite/response.py
index e02d2bb71..065d28f75 100644
--- a/src/masonite/response.py
+++ b/src/masonite/response.py
@@ -203,6 +203,7 @@ def to_bytes(self):
         """
         return bytes(self.converted_data(), 'utf-8')
 
+
 class Responsable:
 
     def get_response(self):
diff --git a/src/masonite/view.py b/src/masonite/view.py
index 58dcfcc9d..f6d6fe19f 100644
--- a/src/masonite/view.py
+++ b/src/masonite/view.py
@@ -7,6 +7,7 @@
 from .exceptions import RequiredContainerBindingNotFound, ViewException
 from .response import Responsable
 
+
 class View(Responsable):
     """View class. Responsible for handling everything involved with views and view environments."""
 
@@ -307,4 +308,4 @@ def set_splice(self, splice):
         return self
 
     def get_response(self):
-        return self.rendered_template
\ No newline at end of file
+        return self.rendered_template

From a7a86656e9b2d0fcee78bb89036fb98ccd33d205 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 18:24:21 -0400
Subject: [PATCH 53/59] fixed middleware test

---
 .deepsource.toml                         |  1 -
 setup.py                                 |  1 -
 src/masonite/testing/TestCase.py         | 42 ++-------------
 src/masonite/testing/__init__.py         |  1 +
 src/masonite/testing/create_container.py | 42 +++++++++++++++
 tests/middleware/test_csrf_middleware.py | 66 ++++++++++--------------
 6 files changed, 73 insertions(+), 80 deletions(-)
 create mode 100644 src/masonite/testing/create_container.py

diff --git a/.deepsource.toml b/.deepsource.toml
index fff2d73c3..12c4cf956 100644
--- a/.deepsource.toml
+++ b/.deepsource.toml
@@ -4,7 +4,6 @@ version = 1
 test_patterns = [
   'tests/**/*.py',
   'masonite/testing/*.py',
-  'masonite/testsuite/*.py',
   'testpackage/*.py'
 ]
 
diff --git a/setup.py b/setup.py
index dd3594d89..a94b673a2 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@
         'masonite.drivers.storage',
         'masonite.drivers.upload',
         'masonite.managers',
-        'masonite.testsuite',
         'masonite.queues',
         'masonite.contracts',
         'masonite.contracts.managers',
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index 6dcca817a..b2e5358c0 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -10,6 +10,7 @@
 from ..helpers.migrations import Migrations
 from ..helpers.routes import create_matchurl, flatten_routes
 from .generate_wsgi import generate_wsgi
+from .create_container import create_container
 from orator.orm import Factory
 from ..app import App
 
@@ -22,11 +23,11 @@ class TestCase(unittest.TestCase):
     transactions = True
     refreshes_database = False
     _transaction = False
-    _with_subdomains = False
 
     def setUp(self):
         from wsgi import container
         self.container = container
+        self._with_subdomains = False
 
         self.acting_user = False
         self.factory = Factory()
@@ -285,41 +286,4 @@ def withoutHttpMiddleware(self):
         return self
 
     def create_container(self):
-        container = App()
-        from config import providers
-
-        container.bind('WSGI', generate_wsgi())
-        # container.bind('Application', application)
-        container.bind('Container', container)
-
-        # container.bind('ProvidersConfig', providers)
-        container.bind('Providers', [])
-        container.bind('WSGIProviders', [])
-
-        """Bind all service providers
-        Let's register everything into the Service Container. Once everything is
-        in the container we can run through all the boot methods. For reasons
-        some providers don't need to execute with every request and should
-        only run once when the server is started. Providers will be ran
-        once if the wsgi attribute on a provider is False.
-        """
-
-        for provider in providers.PROVIDERS:
-            located_provider = provider()
-            located_provider.load_app(container).register()
-            if located_provider.wsgi:
-                container.make('WSGIProviders').append(located_provider)
-            else:
-                container.make('Providers').append(located_provider)
-
-        for provider in container.make('Providers'):
-            container.resolve(provider.boot)
-
-        """Get the application from the container
-        Some providers may change the WSGI Server like wrapping the WSGI server
-        in a Whitenoise container for an example. Let's get a WSGI instance
-        from the container and pass it to the application variable. This
-        will allow WSGI servers to pick it up from the command line
-        """
-
-        return container
+        return create_container()
\ No newline at end of file
diff --git a/src/masonite/testing/__init__.py b/src/masonite/testing/__init__.py
index 1d4ffd931..8a93101d1 100644
--- a/src/masonite/testing/__init__.py
+++ b/src/masonite/testing/__init__.py
@@ -1,3 +1,4 @@
 from .TestCase import TestCase
 from .MockRoute import MockRoute
 from .generate_wsgi import generate_wsgi
+from .create_container import create_container
diff --git a/src/masonite/testing/create_container.py b/src/masonite/testing/create_container.py
new file mode 100644
index 000000000..59e420d22
--- /dev/null
+++ b/src/masonite/testing/create_container.py
@@ -0,0 +1,42 @@
+from ..app import App
+import copy
+
+def create_container():
+        container = copy.deepcopy(App())
+        from .generate_wsgi import generate_wsgi
+        from config import providers
+
+        container.bind('WSGI', generate_wsgi())
+        container.bind('Container', container)
+
+        # container.bind('ProvidersConfig', providers)
+        container.bind('Providers', [])
+        container.bind('WSGIProviders', [])
+
+        """Bind all service providers
+        Let's register everything into the Service Container. Once everything is
+        in the container we can run through all the boot methods. For reasons
+        some providers don't need to execute with every request and should
+        only run once when the server is started. Providers will be ran
+        once if the wsgi attribute on a provider is False.
+        """
+
+        for provider in providers.PROVIDERS:
+            located_provider = provider()
+            located_provider.load_app(container).register()
+            if located_provider.wsgi:
+                container.make('WSGIProviders').append(located_provider)
+            else:
+                container.make('Providers').append(located_provider)
+
+        for provider in container.make('Providers'):
+            container.resolve(provider.boot)
+
+        """Get the application from the container
+        Some providers may change the WSGI Server like wrapping the WSGI server
+        in a Whitenoise container for an example. Let's get a WSGI instance
+        from the container and pass it to the application variable. This
+        will allow WSGI servers to pick it up from the command line
+        """
+
+        return container
diff --git a/tests/middleware/test_csrf_middleware.py b/tests/middleware/test_csrf_middleware.py
index f65c82724..19e354944 100644
--- a/tests/middleware/test_csrf_middleware.py
+++ b/tests/middleware/test_csrf_middleware.py
@@ -4,7 +4,7 @@
 from src.masonite.app import App
 from src.masonite.middleware import CsrfMiddleware
 from src.masonite.exceptions import InvalidCSRFToken
-from src.masonite.routes import Get, Route
+from src.masonite.routes import Get, Route, Post
 import unittest
 from src.masonite.testing import TestCase, generate_wsgi
 
@@ -13,72 +13,61 @@ class TestCSRFMiddleware(TestCase):
 
     def setUp(self):
         super().setUp()
-        wsgi = generate_wsgi()
-        # self.request = Request(wsgi)
-        # self.route = Route().load_environ(wsgi)
-        # self.view = View(self.container)
-        # self.container.bind('Request', self.request)
-
-        self.request = self.container.make('Request')
-        self.request.load_environ(wsgi)
+        self.buildOwnContainer()
+        self.middleware = CsrfMiddleware
+        self.withHttpMiddleware([
+            self.middleware,
+        ])
         self.routes(only=[
-            Get().route('/test/@route', None),
-            Get().route('/test/10', None),
+            Post('/test/@route', 'TestController@show'),
+            Get('/test/10', 'TestController@show'),
+            Post('/', 'TestController@show'),
         ])
 
-
-        self.middleware = self.container.resolve(CsrfMiddleware)
+        self.withCsrf()
 
     def test_middleware_shares_correct_input(self):
-        self.middleware.before()
-        self.assertIn('csrf_field', self.container.make('ViewClass')._shared)
-        self.assertTrue(self.container.make('ViewClass')._shared['csrf_field'].startswith("<input type='hidden' name='__token' value='"))
+        container = self.get('/test/10').container
+        self.assertIn('csrf_field', container.make('ViewClass')._shared)
+        self.assertTrue(container.make('ViewClass')._shared['csrf_field'].startswith("<input type='hidden' name='__token' value='"))
 
     def test_middleware_throws_exception_on_post(self):
-        self.request.environ['REQUEST_METHOD'] = 'POST'
-        self.request.path = '/'
-        self.middleware.exempt = []
         with self.assertRaises(InvalidCSRFToken):
-            self.middleware.before()
+            self.post('/')
 
     def test_middleware_can_accept_param_route(self):
-        self.request.environ['REQUEST_METHOD'] = 'POST'
-        self.request.path = '/test/1'
         self.middleware.exempt = [
             '/test/@route'
         ]
-        self.middleware.before()
+
+        self.post('/test/1')
 
     def test_middleware_can_exempt(self):
-        self.request.environ['REQUEST_METHOD'] = 'POST'
-        self.request.path = '/test/1'
         self.middleware.exempt = [
             '/test/1'
         ]
-        self.middleware.before()
+        self.post('/test/1')
 
     def test_middleware_throws_exeption_on_wrong_route(self):
-        self.request.environ['REQUEST_METHOD'] = 'POST'
-        self.request.path = '/test/10'
         self.middleware.exempt = [
             '/test/2'
         ]
+
         with self.assertRaises(InvalidCSRFToken):
-            self.middleware.before()
+            self.post('/test/11')
 
     def test_incoming_token_does_not_throw_exception_with_token(self):
-        self.request.environ['REQUEST_METHOD'] = 'POST'
-        self.request.request_variables.update({'__token': self.request.get_cookie('csrf_token')})
         self.middleware.exempt = []
-        self.middleware.before()
+        self.withoutCsrf()
+        self.post('/test/11')
 
     def test_generates_csrf_token(self):
-        self.assertTrue(len(self.middleware.generate_token()) == 30)
+        self.assertTrue(len(self.get('/test/10').request.get_cookie('csrf_token', decrypt=False)) == 30)
 
     def test_generates_token_every_request(self):
-        csrf = CsrfMiddleware
-        csrf.every_request = True
-        self.middleware = self.container.resolve(csrf)
+        self.middleware.every_request = True
+        self.get('/test/10')
+        self.middleware = self.container.resolve(self.middleware)
         token1 = self.middleware.verify_token()
         token2 = self.middleware.verify_token()
 
@@ -87,10 +76,9 @@ def test_generates_token_every_request(self):
         self.assertNotEqual(token1, token2)
 
     def test_does_not_generate_token_every_request(self):
-        csrf = CsrfMiddleware
-        csrf.every_request = False
-        self.middleware = self.container.resolve(csrf)
         self.middleware.every_request = False
+        self.get('/test/10')
+        self.middleware = self.container.resolve(self.middleware)
         token1 = self.middleware.verify_token()
         token2 = self.middleware.verify_token()
 

From fab6a0f965b3375fbb8be87c7c2b0fa7bccca4b2 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 18:31:22 -0400
Subject: [PATCH 54/59] fixed unused imports

---
 src/masonite/testing/TestCase.py                   | 1 -
 tests/broadcasts/test_sockets.py                   | 1 -
 tests/core/test_providers.py                       | 3 ---
 tests/core/test_request_routes.py                  | 2 --
 tests/core/test_service_provider.py                | 1 -
 tests/core/test_session.py                         | 3 ---
 tests/middleware/test_cors_middleware.py           | 1 -
 tests/middleware/test_csrf_middleware.py           | 9 ++-------
 tests/middleware/test_secure_headers_middleware.py | 1 -
 tests/storage/test_storage_manager.py              | 1 -
 10 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index b2e5358c0..f92f2a14f 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -12,7 +12,6 @@
 from .generate_wsgi import generate_wsgi
 from .create_container import create_container
 from orator.orm import Factory
-from ..app import App
 
 from .MockRoute import MockRoute
 
diff --git a/tests/broadcasts/test_sockets.py b/tests/broadcasts/test_sockets.py
index 4f942332c..b75cd9750 100644
--- a/tests/broadcasts/test_sockets.py
+++ b/tests/broadcasts/test_sockets.py
@@ -3,7 +3,6 @@
 from src.masonite.drivers import BroadcastPusherDriver
 from src.masonite.managers import BroadcastManager
 from src.masonite.testing import TestCase
-import unittest
 
 if os.getenv('ABLY_SECRET'):
 
diff --git a/tests/core/test_providers.py b/tests/core/test_providers.py
index 022d3146a..65109ec7a 100644
--- a/tests/core/test_providers.py
+++ b/tests/core/test_providers.py
@@ -1,7 +1,4 @@
 
-import unittest
-
-from src.masonite.app import App
 from src.masonite.helpers import config
 from src.masonite.routes import Get
 from src.masonite.testing import TestCase, generate_wsgi
diff --git a/tests/core/test_request_routes.py b/tests/core/test_request_routes.py
index a1670a670..fcef310bb 100644
--- a/tests/core/test_request_routes.py
+++ b/tests/core/test_request_routes.py
@@ -1,7 +1,5 @@
 from src.masonite.routes import Get, Post
-from src.masonite.request import Request
 from src.masonite.testing import TestCase, generate_wsgi
-import unittest
 
 
 class TestRequestRoutes(TestCase):
diff --git a/tests/core/test_service_provider.py b/tests/core/test_service_provider.py
index 961bafd92..3c8643036 100644
--- a/tests/core/test_service_provider.py
+++ b/tests/core/test_service_provider.py
@@ -1,5 +1,4 @@
 import os
-import unittest
 
 from src.masonite.provider import ServiceProvider
 from src.masonite.request import Request
diff --git a/tests/core/test_session.py b/tests/core/test_session.py
index 5bdc51bbc..3231c2634 100644
--- a/tests/core/test_session.py
+++ b/tests/core/test_session.py
@@ -1,9 +1,6 @@
-import unittest
 
-from src.masonite.app import App
 from src.masonite.drivers import SessionCookieDriver, SessionMemoryDriver
 from src.masonite.managers import SessionManager
-from src.masonite.request import Request
 from src.masonite.testing import generate_wsgi, TestCase
 
 class TestSession(TestCase):
diff --git a/tests/middleware/test_cors_middleware.py b/tests/middleware/test_cors_middleware.py
index a7f7847a8..99fb5c854 100644
--- a/tests/middleware/test_cors_middleware.py
+++ b/tests/middleware/test_cors_middleware.py
@@ -2,7 +2,6 @@
 from src.masonite.request import Request
 from src.masonite.testing import generate_wsgi, TestCase
 
-import unittest
 
 
 class TestCorsMiddleware(TestCase):
diff --git a/tests/middleware/test_csrf_middleware.py b/tests/middleware/test_csrf_middleware.py
index 19e354944..5918c18e3 100644
--- a/tests/middleware/test_csrf_middleware.py
+++ b/tests/middleware/test_csrf_middleware.py
@@ -1,12 +1,7 @@
-from src.masonite.request import Request
-from src.masonite.view import View
-from src.masonite.auth.Csrf import Csrf
-from src.masonite.app import App
 from src.masonite.middleware import CsrfMiddleware
 from src.masonite.exceptions import InvalidCSRFToken
-from src.masonite.routes import Get, Route, Post
-import unittest
-from src.masonite.testing import TestCase, generate_wsgi
+from src.masonite.routes import Get, Post
+from src.masonite.testing import TestCase
 
 
 class TestCSRFMiddleware(TestCase):
diff --git a/tests/middleware/test_secure_headers_middleware.py b/tests/middleware/test_secure_headers_middleware.py
index 05c474ec3..b62a365f1 100644
--- a/tests/middleware/test_secure_headers_middleware.py
+++ b/tests/middleware/test_secure_headers_middleware.py
@@ -1,5 +1,4 @@
 """ Test Secure Headers Midddleware """
-import unittest
 
 from src.masonite.middleware import SecureHeadersMiddleware
 from src.masonite.request import Request
diff --git a/tests/storage/test_storage_manager.py b/tests/storage/test_storage_manager.py
index be86ca78b..29aa75e10 100644
--- a/tests/storage/test_storage_manager.py
+++ b/tests/storage/test_storage_manager.py
@@ -1,5 +1,4 @@
 import os
-import unittest
 
 from src.masonite.testing import TestCase
 from src.masonite.managers import StorageManager

From a91ebd905bf870c5e2b7503d0c5d58d168ec6c76 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 18:34:56 -0400
Subject: [PATCH 55/59] linted

---
 src/masonite/testing/TestCase.py         |  2 +-
 src/masonite/testing/create_container.py | 41 ++++++++++++------------
 src/masonite/testing/generate_wsgi.py    |  1 +
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index f92f2a14f..0482eccb3 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -285,4 +285,4 @@ def withoutHttpMiddleware(self):
         return self
 
     def create_container(self):
-        return create_container()
\ No newline at end of file
+        return create_container()
diff --git a/src/masonite/testing/create_container.py b/src/masonite/testing/create_container.py
index 59e420d22..5b6a918d6 100644
--- a/src/masonite/testing/create_container.py
+++ b/src/masonite/testing/create_container.py
@@ -1,19 +1,20 @@
 from ..app import App
 import copy
 
+
 def create_container():
-        container = copy.deepcopy(App())
-        from .generate_wsgi import generate_wsgi
-        from config import providers
+    container = copy.deepcopy(App())
+    from .generate_wsgi import generate_wsgi
+    from config import providers
 
-        container.bind('WSGI', generate_wsgi())
-        container.bind('Container', container)
+    container.bind('WSGI', generate_wsgi())
+    container.bind('Container', container)
 
-        # container.bind('ProvidersConfig', providers)
-        container.bind('Providers', [])
-        container.bind('WSGIProviders', [])
+    # container.bind('ProvidersConfig', providers)
+    container.bind('Providers', [])
+    container.bind('WSGIProviders', [])
 
-        """Bind all service providers
+    """Bind all service providers
         Let's register everything into the Service Container. Once everything is
         in the container we can run through all the boot methods. For reasons
         some providers don't need to execute with every request and should
@@ -21,22 +22,22 @@ def create_container():
         once if the wsgi attribute on a provider is False.
         """
 
-        for provider in providers.PROVIDERS:
-            located_provider = provider()
-            located_provider.load_app(container).register()
-            if located_provider.wsgi:
-                container.make('WSGIProviders').append(located_provider)
-            else:
-                container.make('Providers').append(located_provider)
+    for provider in providers.PROVIDERS:
+        located_provider = provider()
+        located_provider.load_app(container).register()
+        if located_provider.wsgi:
+            container.make('WSGIProviders').append(located_provider)
+        else:
+            container.make('Providers').append(located_provider)
 
-        for provider in container.make('Providers'):
-            container.resolve(provider.boot)
+    for provider in container.make('Providers'):
+        container.resolve(provider.boot)
 
-        """Get the application from the container
+    """Get the application from the container
         Some providers may change the WSGI Server like wrapping the WSGI server
         in a Whitenoise container for an example. Let's get a WSGI instance
         from the container and pass it to the application variable. This
         will allow WSGI servers to pick it up from the command line
         """
 
-        return container
+    return container
diff --git a/src/masonite/testing/generate_wsgi.py b/src/masonite/testing/generate_wsgi.py
index 05e258a3a..e392f085c 100644
--- a/src/masonite/testing/generate_wsgi.py
+++ b/src/masonite/testing/generate_wsgi.py
@@ -1,6 +1,7 @@
 
 import io
 
+
 def generate_wsgi():
     return {
         'wsgi.version': (1, 0),

From 44ad8fc6987ba669fa4f08cff673907503d0dde2 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 19:03:03 -0400
Subject: [PATCH 56/59] linted

---
 src/masonite/auth/guards/WebGuard.py                 |  1 -
 src/masonite/drivers/cache/CacheDiskDriver.py        |  2 +-
 src/masonite/drivers/queue/QueueAmqpDriver.py        |  2 +-
 src/masonite/drivers/queue/QueueDatabaseDriver.py    |  4 ++--
 src/masonite/drivers/upload/UploadS3Driver.py        |  2 +-
 src/masonite/environment.py                          | 12 ++++++------
 src/masonite/helpers/password.py                     |  6 +++---
 src/masonite/routes.py                               |  2 +-
 .../snippets/auth/controllers/ConfirmController.py   |  3 +--
 .../snippets/auth/controllers/PasswordController.py  |  2 +-
 .../snippets/auth/controllers/RegisterController.py  |  2 +-
 11 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/masonite/auth/guards/WebGuard.py b/src/masonite/auth/guards/WebGuard.py
index 480a2ce88..a28164585 100644
--- a/src/masonite/auth/guards/WebGuard.py
+++ b/src/masonite/auth/guards/WebGuard.py
@@ -7,7 +7,6 @@
 from ...drivers import AuthCookieDriver, AuthJwtDriver
 from ...helpers import config
 from ...helpers import password as bcrypt_password
-from ...exceptions import DriverNotFound
 from .AuthenticationGuard import AuthenticationGuard
 
 
diff --git a/src/masonite/drivers/cache/CacheDiskDriver.py b/src/masonite/drivers/cache/CacheDiskDriver.py
index 199933980..71538cec1 100644
--- a/src/masonite/drivers/cache/CacheDiskDriver.py
+++ b/src/masonite/drivers/cache/CacheDiskDriver.py
@@ -13,7 +13,7 @@
 class CacheDiskDriver(CacheContract, BaseCacheDriver):
     """Class for the cache disk driver."""
 
-    def __init__(self, app: App):
+    def __init__(self):
         """Cache disk driver constructor.
 
         Arguments:
diff --git a/src/masonite/drivers/queue/QueueAmqpDriver.py b/src/masonite/drivers/queue/QueueAmqpDriver.py
index 47f549e18..874ecdf44 100644
--- a/src/masonite/drivers/queue/QueueAmqpDriver.py
+++ b/src/masonite/drivers/queue/QueueAmqpDriver.py
@@ -107,7 +107,7 @@ def basic_consume(self, callback, queue_name):
         except TypeError:
             self.channel.basic_consume(queue_name, callback)
 
-    def work(self, ch, method, properties, body):
+    def work(self, ch, method, _, body):
         from wsgi import container
         job = pickle.loads(body)
         obj = job['obj']
diff --git a/src/masonite/drivers/queue/QueueDatabaseDriver.py b/src/masonite/drivers/queue/QueueDatabaseDriver.py
index 03b5cba93..272bba370 100644
--- a/src/masonite/drivers/queue/QueueDatabaseDriver.py
+++ b/src/masonite/drivers/queue/QueueDatabaseDriver.py
@@ -47,7 +47,7 @@ def push(self, *objects, args=(), kwargs={}, **options):
 
         for job in objects:
             if schema.get_schema_builder().has_table('queue_jobs'):
-                payload = pickle.dumps({'obj': job, 'args': args, 'callback': callback})
+                payload = pickle.dumps({'obj': job, 'args': args, 'kwargs': kwargs, 'callback': callback})
                 schema.table('queue_jobs').insert({
                     'name': str(job),
                     'serialized': payload,
@@ -57,7 +57,7 @@ def push(self, *objects, args=(), kwargs={}, **options):
                     'wait_until': wait,
                 })
 
-    def consume(self, channel, fair=False, **options):
+    def consume(self, channel, **options):
         from config.database import DB as schema, DATABASES
         from wsgi import container
 
diff --git a/src/masonite/drivers/upload/UploadS3Driver.py b/src/masonite/drivers/upload/UploadS3Driver.py
index b9ebdb13f..a5d3638af 100644
--- a/src/masonite/drivers/upload/UploadS3Driver.py
+++ b/src/masonite/drivers/upload/UploadS3Driver.py
@@ -13,7 +13,7 @@
 class UploadS3Driver(BaseUploadDriver, UploadContract):
     """Amazon S3 Upload driver."""
 
-    def __init__(self, upload: UploadManager, app: App):
+    def __init__(self, upload: UploadManager):
         """Upload Disk Driver Constructor.
 
         Arguments:
diff --git a/src/masonite/environment.py b/src/masonite/environment.py
index da1484b30..a8970eee6 100644
--- a/src/masonite/environment.py
+++ b/src/masonite/environment.py
@@ -8,7 +8,7 @@
 class LoadEnvironment:
     """This class is used for loading the environment from .env and .env.* files."""
 
-    def __init__(self, env=None, override=True, only=None):
+    def __init__(self, environment=None, override=True, only=None):
         """LoadEnvironment constructor.
 
         Keyword Arguments:
@@ -29,22 +29,22 @@ def __init__(self, env=None, override=True, only=None):
         if os.environ.get('APP_ENV'):
             self._load_environment(os.environ.get(
                 'APP_ENV'), override=override)
-        if env:
-            self._load_environment(env, override=override)
+        if environment:
+            self._load_environment(environment, override=override)
 
         if "pytest" in sys.modules:
             self._load_environment('testing', override=override)
 
-    def _load_environment(self, env, override=False):
+    def _load_environment(self, environment, override=False):
         """Load the environment depending on the env file.
 
         Arguments:
-            env {string} -- Name of the environment file to load from
+            environment {string} -- Name of the environment file to load from
 
         Keyword Arguments:
             override {bool} -- Whether the environment file should overwrite existing environment keys. (default: {False})
         """
-        env_path = str(Path('.') / '.env.{}'.format(env))
+        env_path = str(Path('.') / '.env.{}'.format(environment))
         self.env(dotenv_path=env_path, override=override)
 
 
diff --git a/src/masonite/helpers/password.py b/src/masonite/helpers/password.py
index 606fe0091..e465c949b 100644
--- a/src/masonite/helpers/password.py
+++ b/src/masonite/helpers/password.py
@@ -3,17 +3,17 @@
 import bcrypt
 
 
-def password(password):
+def password(password_string):
     """Bcrypt a string.
 
     Useful for storing passwords in a database.
 
     Arguments:
-        password {string} -- A string like a users plain text password to be bcrypted.
+        pass {string} -- A string like a users plain text password to be bcrypted.
 
     Returns:
         string -- The encrypted string.
     """
     return bytes(bcrypt.hashpw(
-        bytes(password, 'utf-8'), bcrypt.gensalt()
+        bytes(password_string, 'utf-8'), bcrypt.gensalt()
     )).decode('utf-8')
diff --git a/src/masonite/routes.py b/src/masonite/routes.py
index 0c4a8a17f..038043021 100644
--- a/src/masonite/routes.py
+++ b/src/masonite/routes.py
@@ -218,7 +218,7 @@ def _find_controller(self, controller):
         except Exception:
             import sys
             import traceback
-            exc_type, _, exc_tb = sys.exc_info()
+            _, _, exc_tb = sys.exc_info()
             tb = traceback.extract_tb(exc_tb)[-1]
             print('\033[93mTrouble importing controller!', str(e), '\033[0m')
 
diff --git a/src/masonite/snippets/auth/controllers/ConfirmController.py b/src/masonite/snippets/auth/controllers/ConfirmController.py
index b7945633d..ed1bf06fb 100644
--- a/src/masonite/snippets/auth/controllers/ConfirmController.py
+++ b/src/masonite/snippets/auth/controllers/ConfirmController.py
@@ -16,11 +16,10 @@ def __init__(self):
         """The ConfirmController Constructor."""
         pass
 
-    def verify_show(self, request: Request, view: View, auth: Auth):
+    def verify_show(self, view: View, auth: Auth):
         """Show the Verify Email page for unverified users.
 
         Arguments:
-            request {masonite.request.request} -- The Masonite request class.
             request {masonite.view.view} -- The Masonite view class.
             request {masonite.auth.auth} -- The Masonite Auth class.
 
diff --git a/src/masonite/snippets/auth/controllers/PasswordController.py b/src/masonite/snippets/auth/controllers/PasswordController.py
index ebcf76250..4c11dc899 100644
--- a/src/masonite/snippets/auth/controllers/PasswordController.py
+++ b/src/masonite/snippets/auth/controllers/PasswordController.py
@@ -13,7 +13,7 @@
 class PasswordController:
     """Password Controller."""
 
-    def forget(self, view: View, request: Request, auth: Auth):
+    def forget(self, view: View, auth: Auth):
         return view.render('auth/forget', {'app': config('application'), 'Auth': auth})
 
     def reset(self, request: Request, auth: Auth):
diff --git a/src/masonite/snippets/auth/controllers/RegisterController.py b/src/masonite/snippets/auth/controllers/RegisterController.py
index 5b256070c..ad171db25 100644
--- a/src/masonite/snippets/auth/controllers/RegisterController.py
+++ b/src/masonite/snippets/auth/controllers/RegisterController.py
@@ -15,7 +15,7 @@ def __init__(self):
         """The RegisterController Constructor."""
         pass
 
-    def show(self, request: Request, view: View, auth: Auth):
+    def show(self, view: View, auth: Auth):
         """Show the registration page.
 
         Arguments:

From ec1bf8ec29669d28bac6e8d4ff74180760ec3ecc Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 19:08:42 -0400
Subject: [PATCH 57/59] fixed skipcq rules

---
 app/http/controllers/ConfirmController.py         | 2 +-
 src/masonite/drivers/cache/CacheDiskDriver.py     | 1 -
 src/masonite/drivers/queue/QueueAmqpDriver.py     | 2 +-
 src/masonite/drivers/queue/QueueDatabaseDriver.py | 4 ++--
 src/masonite/drivers/upload/UploadS3Driver.py     | 1 -
 src/masonite/routes.py                            | 2 +-
 src/masonite/testing/TestCase.py                  | 2 +-
 7 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/http/controllers/ConfirmController.py b/app/http/controllers/ConfirmController.py
index 4328db0d9..701178a42 100644
--- a/app/http/controllers/ConfirmController.py
+++ b/app/http/controllers/ConfirmController.py
@@ -16,7 +16,7 @@ def __init__(self):
         """The ConfirmController Constructor."""
         pass
 
-    def verify_show(self, request: Request, view: View, auth: Auth):
+    def verify_show(self, view: View, auth: Auth):
         """Show the Verify Email page for unverified users.
 
         Arguments:
diff --git a/src/masonite/drivers/cache/CacheDiskDriver.py b/src/masonite/drivers/cache/CacheDiskDriver.py
index 71538cec1..f1c767b95 100644
--- a/src/masonite/drivers/cache/CacheDiskDriver.py
+++ b/src/masonite/drivers/cache/CacheDiskDriver.py
@@ -4,7 +4,6 @@
 import os
 import time
 
-from ...app import App
 from ...contracts import CacheContract
 from ...drivers import BaseCacheDriver
 from ...helpers import config
diff --git a/src/masonite/drivers/queue/QueueAmqpDriver.py b/src/masonite/drivers/queue/QueueAmqpDriver.py
index 874ecdf44..ab46268b4 100644
--- a/src/masonite/drivers/queue/QueueAmqpDriver.py
+++ b/src/masonite/drivers/queue/QueueAmqpDriver.py
@@ -40,7 +40,7 @@ def _publish(self, body):
         self.channel.close()
         self.connection.close()
 
-    def push(self, *objects, args=(), callback='handle', ran=1, channel=None, **options):
+    def push(self, *objects, args=(), callback='handle', ran=1, channel=None, **options):  # skipcq PYL-W0613
         """Push objects onto the amqp stack.
 
         Arguments:
diff --git a/src/masonite/drivers/queue/QueueDatabaseDriver.py b/src/masonite/drivers/queue/QueueDatabaseDriver.py
index 272bba370..5739fc191 100644
--- a/src/masonite/drivers/queue/QueueDatabaseDriver.py
+++ b/src/masonite/drivers/queue/QueueDatabaseDriver.py
@@ -57,7 +57,7 @@ def push(self, *objects, args=(), kwargs={}, **options):
                     'wait_until': wait,
                 })
 
-    def consume(self, channel, **options):
+    def consume(self, channel, **options):  # skipcq
         from config.database import DB as schema, DATABASES
         from wsgi import container
 
@@ -107,7 +107,7 @@ def consume(self, channel, **options):
                         self.success('[\u2713] Job Successfully Processed')
                     except UnicodeEncodeError:
                         self.success('[Y] Job Successfully Processed')
-                except Exception as e:
+                except Exception as e:  # skipcq
                     self.danger('Job Failed: {}'.format(str(e)))
 
                     if not obj.run_again_on_fail:
diff --git a/src/masonite/drivers/upload/UploadS3Driver.py b/src/masonite/drivers/upload/UploadS3Driver.py
index a5d3638af..dec50bd44 100644
--- a/src/masonite/drivers/upload/UploadS3Driver.py
+++ b/src/masonite/drivers/upload/UploadS3Driver.py
@@ -6,7 +6,6 @@
 from ...drivers import BaseUploadDriver
 from ...exceptions import DriverLibraryNotFound
 from ...managers import UploadManager
-from ...app import App
 from ...helpers import config
 
 
diff --git a/src/masonite/routes.py b/src/masonite/routes.py
index 038043021..2c52b55dd 100644
--- a/src/masonite/routes.py
+++ b/src/masonite/routes.py
@@ -215,7 +215,7 @@ def _find_controller(self, controller):
             tb = traceback.extract_tb(exc_tb)[-1]
             print('\033[93mCannot find controller {}. Did you create this one? Raised: {} in {} on line {}'.format(
                 get_controller, str(e), tb[0], tb[1]), '\033[0m')
-        except Exception:
+        except Exception:  # skipcq
             import sys
             import traceback
             _, _, exc_tb = sys.exc_info()
diff --git a/src/masonite/testing/TestCase.py b/src/masonite/testing/TestCase.py
index 0482eccb3..7131f9808 100644
--- a/src/masonite/testing/TestCase.py
+++ b/src/masonite/testing/TestCase.py
@@ -228,7 +228,7 @@ def run_container(self, wsgi_values={}):
         try:
             for provider in self.container.make('WSGIProviders'):
                 self.container.resolve(provider.boot)
-        except Exception as e:
+        except Exception as e:  # skipcq
             if self._exception_handling:
                 self.container.make('ExceptionHandler').load_exception(e)
             else:

From 5561d1f61d92444c966a621b5c9674ff87498a70 Mon Sep 17 00:00:00 2001
From: Joseph Mancuso <idmann509@gmail.com>
Date: Sat, 2 Nov 2019 19:11:59 -0400
Subject: [PATCH 58/59] linted

---
 app/http/controllers/TestController.py        | 2 +-
 app/http/controllers/WelcomeController.py     | 3 +--
 app/http/middleware/AddAttributeMiddleware.py | 2 +-
 config/auth.py                                | 2 --
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/http/controllers/TestController.py b/app/http/controllers/TestController.py
index 8bf3725cf..ea92de22f 100644
--- a/app/http/controllers/TestController.py
+++ b/app/http/controllers/TestController.py
@@ -29,7 +29,7 @@ def change_404(self, request: Request):
     def testing(self):
         return 'test'
 
-    def json_response(self, request: Request):
+    def json_response(self):
         return {'id': 2}
 
     def post_test(self):
diff --git a/app/http/controllers/WelcomeController.py b/app/http/controllers/WelcomeController.py
index 7fdf8b239..d2c0ebd67 100644
--- a/app/http/controllers/WelcomeController.py
+++ b/app/http/controllers/WelcomeController.py
@@ -1,14 +1,13 @@
 """Welcome The User To Masonite."""
 
 from src.masonite.view import View
-from src.masonite.request import Request
 from src.masonite.controllers import Controller
 
 
 class WelcomeController(Controller):
     """Controller For Welcoming The User."""
 
-    def show(self, view: View, request: Request):
+    def show(self, view: View):
         """Show the welcome page.
 
         Arguments:
diff --git a/app/http/middleware/AddAttributeMiddleware.py b/app/http/middleware/AddAttributeMiddleware.py
index a8ccab191..5893e6e69 100644
--- a/app/http/middleware/AddAttributeMiddleware.py
+++ b/app/http/middleware/AddAttributeMiddleware.py
@@ -8,7 +8,7 @@ class AddAttributeMiddleware:
 
     def __init__(self, request: Request):
         """Inject Any Dependencies From The Service Container."""
-        self.request = Request
+        self.request = request
 
     def before(self):
         """Run This Middleware Before The Route Executes."""
diff --git a/config/auth.py b/config/auth.py
index ee2cb5adc..bb1440ac0 100644
--- a/config/auth.py
+++ b/config/auth.py
@@ -1,7 +1,5 @@
 """Authentication Settings."""
 
-from src.masonite import env
-
 from app.User import User
 
 """Authentication Model

From b352c4dba22a8116a7accefa730978d8779e03d1 Mon Sep 17 00:00:00 2001
From: Marlysson <marlysson5@gmail.com>
Date: Sat, 4 Jan 2020 04:09:08 -0300
Subject: [PATCH 59/59] Adding an server that support Option preflight request.

---
 src/masonite/commands/ServeCommand.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/masonite/commands/ServeCommand.py b/src/masonite/commands/ServeCommand.py
index e942a5577..3c4c19885 100644
--- a/src/masonite/commands/ServeCommand.py
+++ b/src/masonite/commands/ServeCommand.py
@@ -20,6 +20,7 @@ class ServeCommand(Command):
         {--d|dont-reload : Make the server NOT automatically reload on file changes}
         {--i|reload-interval=1 : Number of seconds to wait to reload after changed are detected}
         {--l|live-reload : Make the server automatically refresh your web browser}
+        {--o|optimize} : Run a more robust server to handle more requests}
     """
 
     def handle(self):
@@ -66,7 +67,18 @@ def handle(self):
 
             self._run_reloader(reloader, extra_files=[".env", "storage/"])
 
+        if self.option('optimize'):
+
+            try:
+                from waitress import serve
+            except ImportError
+                raise DriverLibraryNotFound("Could not find the waitress server. Install it by running 'pip install waitress==1.4.0'")
+            
+            from wsgi import application
+            serve(application, host=self.option('host'), port=self.option('port'))
+
         else:
+
             from wsgi import application
             from ._devserver import run
             run(self.option("host"), self.option("port"), application)