diff --git a/services/workflow/setup.py b/services/workflow/setup.py
index ee3172b1afee4566fa5b7ebbea7c0f40e0176ecb..88752e0c16d0f84e63104d0e360a2450b304d5bb 100644
--- a/services/workflow/setup.py
+++ b/services/workflow/setup.py
@@ -97,7 +97,7 @@ setup(
     packages=find_packages(),
     entry_points={
         'paste.app_factory': [
-            'main = workflow:main'
+            'main = workflow.server:main'
         ],
     },
 )
diff --git a/services/workflow/src/workflow/__init__.py b/services/workflow/src/workflow/__init__.py
index 62aa295e904a64a197c33825643a92a16e01934e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/services/workflow/src/workflow/__init__.py
+++ b/services/workflow/src/workflow/__init__.py
@@ -1,29 +0,0 @@
-from schema import create_engine
-from pyramid.config import Configurator
-from pyramid_beaker import session_factory_from_settings
-from sqlalchemy.orm import scoped_session, sessionmaker
-from zope.sqlalchemy import ZopeTransactionExtension
-from pyramid.renderers import JSONP
-
-from workflow.workflow import lookup_workflow, lookup_file
-
-DB = {}
-
-
-def main(global_config, **settings):
-    # DB['SDM'] = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
-
-    with Configurator(settings=settings) as config:
-        session_factory = session_factory_from_settings(settings)
-        config.set_session_factory(session_factory)
-        config.add_renderer('jsonp', JSONP(param_name='callback'))
-
-        config.add_route('workflows', '/workflows')
-        config.add_route('workflow', '/workflows/{id}', factory=lookup_workflow)
-        config.add_route('submit_workflow', '/workflows/{id}/submit', factory=lookup_workflow)
-        config.add_route('workflow_files', '/workflows/{id}/files', factory=lookup_workflow)
-        config.add_route('workflow_file', '/workflows/{id}/files/{filename}', factory=lookup_file)
-
-        config.include('pyramid_beaker')
-        config.scan('workflow.workflow')
-        return config.make_wsgi_app()
diff --git a/services/workflow/src/workflow/workflow.py b/services/workflow/src/workflow/server.py
similarity index 61%
rename from services/workflow/src/workflow/workflow.py
rename to services/workflow/src/workflow/server.py
index 46c9f890a13a780deb7c3ec14c99cd3f75d2194a..160fc288fd198fedd230694b15c0d23f3735b1f1 100644
--- a/services/workflow/src/workflow/workflow.py
+++ b/services/workflow/src/workflow/server.py
@@ -1,5 +1,7 @@
-from pyramid.response import Response
 from pyramid.view import view_config, view_defaults
+from pyramid.config import Configurator
+from pyramid_beaker import session_factory_from_settings
+from pyramid.renderers import JSONP
 
 WORKFLOWS = [{'id': 1, 'name': 'foo', 'files': {'file.txt': {'id': 1, 'name': 'file.txt', 'content': 'Hello, world!'}}}]
 
@@ -50,4 +52,23 @@ class WorkflowService:
 
     @view_config(request_method='GET', route_name='workflow_file', accept='application/json')
     def get_file_json(self):
-        return self.request.context
\ No newline at end of file
+        return self.request.context
+
+
+def main(global_config, **settings):
+    # DB['SDM'] = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
+
+    with Configurator(settings=settings) as config:
+        session_factory = session_factory_from_settings(settings)
+        config.set_session_factory(session_factory)
+        config.add_renderer('jsonp', JSONP(param_name='callback'))
+
+        config.add_route('workflows', '/workflows')
+        config.add_route('workflow', '/workflows/{id}', factory=lookup_workflow)
+        config.add_route('submit_workflow', '/workflows/{id}/submit', factory=lookup_workflow)
+        config.add_route('workflow_files', '/workflows/{id}/files', factory=lookup_workflow)
+        config.add_route('workflow_file', '/workflows/{id}/files/{filename}', factory=lookup_file)
+
+        config.include('pyramid_beaker')
+        config.scan('.')
+        return config.make_wsgi_app()