diff --git a/app/__init__.py b/app/__init__.py
index 84cd3298f9..edf5291bf4 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -24,18 +24,16 @@ def create_app(config_name):
     db.init_app(application)
     ma.init_app(application)
     init_app(application)
-
     logging.init_app(application)
 
-    from .service import service as service_blueprint
-    from .user import user as user_blueprint
-    from .template import template as template_blueprint
+    from app.service.rest import service as service_blueprint
+    from app.user.rest import user as user_blueprint
+    from app.template.rest import template as template_blueprint
+    from app.status.healthcheck import status as status_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")
-
-    from .status import status as status_blueprint
-    application.register_blueprint(status_blueprint)
+    application.register_blueprint(status_blueprint, url_prefix='/status')
 
     return application
 
diff --git a/app/service/__init__.py b/app/service/__init__.py
index 82be0231c3..e69de29bb2 100644
--- a/app/service/__init__.py
+++ b/app/service/__init__.py
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-service = Blueprint('service', __name__)
-
-from app.service.views import rest
diff --git a/app/service/views/rest.py b/app/service/rest.py
similarity index 98%
rename from app/service/views/rest.py
rename to app/service/rest.py
index ffd570d7e1..7b8c52b8bc 100644
--- a/app/service/views/rest.py
+++ b/app/service/rest.py
@@ -14,10 +14,11 @@
 from app.models import Token
 from app.schemas import (
     services_schema, service_schema, template_schema)
-from .. import service
+
+from flask import Blueprint
+service = Blueprint('service', __name__)
 
 
-# TODO auth to be added.
 @service.route('/', methods=['POST'])
 def create_service():
     # TODO what exceptions get passed from schema parsing?
diff --git a/app/service/views/__init__.py b/app/service/views/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/status/__init__.py b/app/status/__init__.py
index fcbc7ceceb..e69de29bb2 100644
--- a/app/status/__init__.py
+++ b/app/status/__init__.py
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-status = Blueprint('status', __name__)
-
-from app.status.views import healthcheck
diff --git a/app/status/views/healthcheck.py b/app/status/healthcheck.py
similarity index 55%
rename from app/status/views/healthcheck.py
rename to app/status/healthcheck.py
index ef7a6ee699..1ab87e0db1 100644
--- a/app/status/views/healthcheck.py
+++ b/app/status/healthcheck.py
@@ -1,10 +1,11 @@
 from flask import jsonify
 
-from app.status import status
+from flask import Blueprint
+status = Blueprint('status', __name__)
 
 
 @status.route('/_status')
-def status():
+def show_status():
     return jsonify(
         status="ok",
     ), 200
diff --git a/app/status/views/__init__.py b/app/status/views/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/template/__init__.py b/app/template/__init__.py
index 680c3f4ac8..e69de29bb2 100644
--- a/app/template/__init__.py
+++ b/app/template/__init__.py
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-template = Blueprint('template', __name__)
-
-from app.template import rest
diff --git a/app/template/rest.py b/app/template/rest.py
index 82e23f321d..57b29c2d59 100644
--- a/app/template/rest.py
+++ b/app/template/rest.py
@@ -1,16 +1,12 @@
-from flask import (jsonify, request)
+from flask import Blueprint
+from flask import (jsonify)
 from sqlalchemy.exc import DataError
 from sqlalchemy.orm.exc import NoResultFound
+
 from app.dao.templates_dao import get_model_templates
-from app.dao.services_dao import get_model_services
 from app.schemas import (template_schema, templates_schema)
-from app import db
 
-from flask import (jsonify, request)
-from sqlalchemy.exc import DataError
-from sqlalchemy.orm.exc import NoResultFound
-from . import template
-from app import db
+template = Blueprint('template', __name__)
 
 
 # I am going to keep these for admin like operations
diff --git a/app/user/__init__.py b/app/user/__init__.py
index 07cb211c66..e69de29bb2 100644
--- a/app/user/__init__.py
+++ b/app/user/__init__.py
@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-user = Blueprint('user', __name__)
-
-from app.user.views import rest
diff --git a/app/user/views/rest.py b/app/user/rest.py
similarity index 97%
rename from app/user/views/rest.py
rename to app/user/rest.py
index a2633d9f73..16c81218d0 100644
--- a/app/user/views/rest.py
+++ b/app/user/rest.py
@@ -6,10 +6,13 @@
     get_model_users, save_model_user, delete_model_user)
 from app.schemas import (
     user_schema, users_schema, service_schema, services_schema)
-from .. import user
 from app import db
 
 
+from flask import Blueprint
+user = Blueprint('user', __name__)
+
+
 # TODO auth to be added
 @user.route('/', methods=['POST'])
 def create_user():
diff --git a/app/user/views/__init__.py b/app/user/views/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000