diff --git a/README.md b/README.md
index 9db1d15..1334a2f 100644
--- a/README.md
+++ b/README.md
@@ -24,11 +24,11 @@ Set up the environment variables for Solr and PostgreSQL:
 
 Index the Solr statistics core to populate the PostgreSQL database:
 
-    $ ./indexer.py
+    $ python -m dspace_statistics_api.indexer
 
 Run the REST API:
 
-    $ gunicorn app:api
+    $ gunicorn dspace_statistics_api.app:api
 
 Test to see if there are any statistics:
 
diff --git a/dspace_statistics_api/__init__.py b/dspace_statistics_api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app.py b/dspace_statistics_api/app.py
similarity index 98%
rename from app.py
rename to dspace_statistics_api/app.py
index 49f89f3..0801f25 100644
--- a/app.py
+++ b/dspace_statistics_api/app.py
@@ -1,4 +1,4 @@
-from database import database_connection
+from .database import database_connection
 import falcon
 
 db = database_connection()
diff --git a/config.py b/dspace_statistics_api/config.py
similarity index 100%
rename from config.py
rename to dspace_statistics_api/config.py
diff --git a/database.py b/dspace_statistics_api/database.py
similarity index 69%
rename from database.py
rename to dspace_statistics_api/database.py
index 2cbb75c..3dae8ec 100644
--- a/database.py
+++ b/dspace_statistics_api/database.py
@@ -1,7 +1,7 @@
-from config import DATABASE_NAME
-from config import DATABASE_USER
-from config import DATABASE_PASS
-from config import DATABASE_HOST
+from .config import DATABASE_NAME
+from .config import DATABASE_USER
+from .config import DATABASE_PASS
+from .config import DATABASE_HOST
 import psycopg2, psycopg2.extras
 
 def database_connection():
diff --git a/indexer.py b/dspace_statistics_api/indexer.py
similarity index 98%
rename from indexer.py
rename to dspace_statistics_api/indexer.py
index 82b1e5d..2488935 100755
--- a/indexer.py
+++ b/dspace_statistics_api/indexer.py
@@ -30,10 +30,10 @@
 # See: https://solrclient.readthedocs.io/en/latest/SolrClient.html
 # See: https://wiki.duraspace.org/display/DSPACE/Solr
 
-from database import database_connection
+from .database import database_connection
 import json
 import psycopg2.extras
-from solr import solr_connection
+from .solr import solr_connection
 
 def index_views():
     # get total number of distinct facets for items with a minimum of 1 view,
diff --git a/solr.py b/dspace_statistics_api/solr.py
similarity index 82%
rename from solr.py
rename to dspace_statistics_api/solr.py
index e2677b7..96a5a68 100644
--- a/solr.py
+++ b/dspace_statistics_api/solr.py
@@ -1,4 +1,4 @@
-from config import SOLR_SERVER
+from .config import SOLR_SERVER
 from SolrClient import SolrClient
 
 def solr_connection():