diff --git a/app/__init__.py b/app/__init__.py
index 7ee54c648..84cd3298f 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -27,11 +27,9 @@ def create_app(config_name):
 
     logging.init_app(application)
 
-    from .main import main as main_blueprint
     from .service import service as service_blueprint
     from .user import user as user_blueprint
     from .template import template as template_blueprint
-    application.register_blueprint(main_blueprint)
     application.register_blueprint(service_blueprint, url_prefix='/service')
     application.register_blueprint(user_blueprint, url_prefix='/user')
     application.register_blueprint(template_blueprint, url_prefix="/template")
@@ -39,8 +37,6 @@ def create_app(config_name):
     from .status import status as status_blueprint
     application.register_blueprint(status_blueprint)
 
-    from app import models
-
     return application
 
 
diff --git a/app/main/authentication/__init__.py b/app/authentication/__init__.py
similarity index 100%
rename from app/main/authentication/__init__.py
rename to app/authentication/__init__.py
diff --git a/app/main/authentication/auth.py b/app/authentication/auth.py
similarity index 100%
rename from app/main/authentication/auth.py
rename to app/authentication/auth.py
diff --git a/app/main/errors.py b/app/errors.py
similarity index 100%
rename from app/main/errors.py
rename to app/errors.py
diff --git a/app/main/__init__.py b/app/main/__init__.py
deleted file mode 100644
index 538216f43..000000000
--- a/app/main/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-main = Blueprint('main', __name__)
-
-from app.main.views import index
diff --git a/app/main/views/__init__.py b/app/main/views/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/main/views/index.py b/app/main/views/index.py
deleted file mode 100644
index 8037ce7e1..000000000
--- a/app/main/views/index.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from flask import jsonify
-from .. import main