diff --git a/congress/api/__init__.py b/congress/api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/congress/server/webservice.py b/congress/api/webservice.py
similarity index 100%
rename from congress/server/webservice.py
rename to congress/api/webservice.py
diff --git a/congress/server/wsgi.py b/congress/api/wsgi.py
similarity index 100%
rename from congress/server/wsgi.py
rename to congress/api/wsgi.py
diff --git a/congress/server/server.py b/congress/server/server.py
index d473e3dec..b335257c8 100755
--- a/congress/server/server.py
+++ b/congress/server/server.py
@@ -26,14 +26,14 @@ import ovs.vlog
 vlog = ovs.vlog.Vlog(__name__)
 
 from ad_sync import UserGroupDataModel
-from webservice import ApiApplication
-from webservice import CollectionHandler
-from webservice import ElementHandler
-from webservice import PolicyDataModel
-from webservice import RowCollectionHandler
-from webservice import RowElementHandler
-from webservice import SimpleDataModel
-from wsgi import Server
+from api.webservice import ApiApplication
+from api.webservice import CollectionHandler
+from api.webservice import ElementHandler
+from api.webservice import PolicyDataModel
+from api.webservice import RowCollectionHandler
+from api.webservice import RowElementHandler
+from api.webservice import SimpleDataModel
+from api.wsgi import Server
 
 
 DEFAULT_HTTP_ADDR = '0.0.0.0'
diff --git a/scripts/run_api_server b/scripts/run_api_server
index 3c92a8859..c50b83b1a 100755
--- a/scripts/run_api_server
+++ b/scripts/run_api_server
@@ -43,7 +43,7 @@ SERVERDIR=$PYSRCDIR/server
 POLICYDIR=$PYSRCDIR/policy
 THIRDPARTYDIR=$ROOTDIR/thirdparty
 
-export PYTHONPATH=$SRCDIR:$THIRDPARTYDIR
+export PYTHONPATH=$PYSRCDIR:$THIRDPARTYDIR
 
 # Settings that typically don't change
 INTERFACE=0.0.0.0