diff --git a/MANIFEST.in b/MANIFEST.in
index 40c6ac84..2c4851a6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
-global-exclude *.pyc
+include README.md
+include squeakserver/admin/webapp/templates/*.html
diff --git a/squeakserver/admin/webapp/__init__.py b/squeakserver/admin/webapp/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/squeakserver/admin/squeak_admin_web_service.py b/squeakserver/admin/webapp/app.py
similarity index 90%
rename from squeakserver/admin/squeak_admin_web_service.py
rename to squeakserver/admin/webapp/app.py
index 9ed2430f..625ef334 100644
--- a/squeakserver/admin/squeak_admin_web_service.py
+++ b/squeakserver/admin/webapp/app.py
@@ -1,4 +1,5 @@
 import os
+from os.path import abspath, dirname
 import logging
 
 from flask import Flask
@@ -18,8 +19,8 @@ from google.protobuf import message
 from proto import squeak_admin_pb2, squeak_admin_pb2_grpc
 from proto import lnd_pb2, lnd_pb2_grpc
 
-from squeakserver.admin.squeak_admin_web_user import User
-from squeakserver.admin.forms import LoginForm
+from squeakserver.admin.webapp.squeak_admin_web_user import User
+from squeakserver.admin.webapp.forms import LoginForm
 
 logger = logging.getLogger(__name__)
 
@@ -27,11 +28,19 @@ logger = logging.getLogger(__name__)
 def create_app(handler, username, password):
     # create and configure the app
     logger.info("Starting flask app from directory: {}".format(os.getcwd()))
+    root_path = 'squeakserver/admin/webapp'
+    # root_path = os.path.dirname(os.path.realpath(__file__))
+    logger.info("Starting flask with root_path: {}".format(root_path))
+    # readme = open("README.md", "r").read()
+    # logger.info("Starting flask with README: {}".format(readme))
+    # base_template = open("squeakserver/admin/webapp/templates/base.html", "r").read()
+    # logger.info("Starting flask with template: {}".format(base_template))
     app = Flask(
         __name__,
         static_folder='/app/static/build',
         static_url_path='/',
-        template_folder='/app/squeakserver/admin/templates',
+        template_folder='templates',
+        root_path=root_path,
     )
     app.config.from_mapping(
         SECRET_KEY='dev',
@@ -41,6 +50,12 @@ def create_app(handler, username, password):
         username,
         password,
     )
+    logger.info("Starting flask with app.root_path: {}".format(app.root_path))
+    logger.info("Files in root path: {}".format(os.listdir(app.root_path)))
+    other_path = abspath(dirname(__file__))
+    logger.info("Starting flask other_path: {}".format(other_path))
+    logger.info("template folder: {}".format(app.template_folder))
+    # logger.info("Files in template folder: {}".format(os.listdir(app.template_folder)))
 
 
     @login.user_loader
diff --git a/squeakserver/admin/forms.py b/squeakserver/admin/webapp/forms.py
similarity index 86%
rename from squeakserver/admin/forms.py
rename to squeakserver/admin/webapp/forms.py
index e58edf88..cb43a841 100644
--- a/squeakserver/admin/forms.py
+++ b/squeakserver/admin/webapp/forms.py
@@ -2,7 +2,7 @@ from flask_wtf import FlaskForm
 from wtforms import StringField, PasswordField, BooleanField, SubmitField
 from wtforms.validators import ValidationError, DataRequired, EqualTo
 
-from squeakserver.admin.squeak_admin_web_user import User
+from squeakserver.admin.webapp.squeak_admin_web_user import User
 
 
 class LoginForm(FlaskForm):
diff --git a/squeakserver/admin/squeak_admin_web_user.py b/squeakserver/admin/webapp/squeak_admin_web_user.py
similarity index 100%
rename from squeakserver/admin/squeak_admin_web_user.py
rename to squeakserver/admin/webapp/squeak_admin_web_user.py
diff --git a/squeakserver/admin/templates/base.html b/squeakserver/admin/webapp/templates/base.html
similarity index 100%
rename from squeakserver/admin/templates/base.html
rename to squeakserver/admin/webapp/templates/base.html
diff --git a/squeakserver/admin/templates/hello.html b/squeakserver/admin/webapp/templates/hello.html
similarity index 100%
rename from squeakserver/admin/templates/hello.html
rename to squeakserver/admin/webapp/templates/hello.html
diff --git a/squeakserver/admin/templates/login.html b/squeakserver/admin/webapp/templates/login.html
similarity index 100%
rename from squeakserver/admin/templates/login.html
rename to squeakserver/admin/webapp/templates/login.html
diff --git a/squeakserver/main.py b/squeakserver/main.py
index 09329756..38ffd882 100644
--- a/squeakserver/main.py
+++ b/squeakserver/main.py
@@ -10,7 +10,7 @@ from squeak.params import SelectParams
 
 from squeakserver.admin.squeak_admin_server_handler import SqueakAdminServerHandler
 from squeakserver.admin.squeak_admin_server_servicer import SqueakAdminServerServicer
-from squeakserver.admin.squeak_admin_web_service import SqueakAdminWebServer
+from squeakserver.admin.webapp.app import SqueakAdminWebServer
 from squeakserver.blockchain.bitcoin_blockchain_client import BitcoinBlockchainClient
 from squeakserver.common.lnd_lightning_client import LNDLightningClient
 from squeakserver.db.db_engine import get_postgres_engine, get_sqlite_engine