diff --git a/Dockerfile b/Dockerfile
index 66b21c5..b640ec0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,18 @@
 # set base image (host OS)
 FROM python:3.9
 
-# set the working directory in the container
-WORKDIR /code
+WORKDIR /
+COPY service/__init__.py /service/
+COPY service/requirements.txt /service/
+COPY service/simple.py /service/
 
-# copy the dependencies file to the working directory
-COPY requirements.txt .
+COPY test/test_simple.py /test/
 
 # install dependencies
-RUN pip install -r requirements.txt
+RUN pip install -r /service/requirements.txt
 
-# copy the content of the local src directory to the working directory
-COPY test/ .
-COPY src/ .
-
-# Run the tests first
-CMD [ "pytest", "-v test_*.py"]
+# Run the tests as the final check
+RUN export PYTHONPATH=$PYTHONPATH:./;pytest -v /test/test_*.py -r A
 
 # command to run on container start
-CMD [ "python", "./server.py" ]
\ No newline at end of file
+CMD [ "python", "/service/simple.py" ]
\ No newline at end of file
diff --git a/service/__init__.py b/service/__init__.py
new file mode 100644
index 0000000..1d1ab24
--- /dev/null
+++ b/service/__init__.py
@@ -0,0 +1,3 @@
+# Things and such
+from .simple import app
+
diff --git a/app/requirements.txt b/service/requirements.txt
similarity index 100%
rename from app/requirements.txt
rename to service/requirements.txt
diff --git a/app/src/simple.py b/service/simple.py
similarity index 96%
rename from app/src/simple.py
rename to service/simple.py
index 291b8b1..8ebe6e5 100755
--- a/app/src/simple.py
+++ b/service/simple.py
@@ -61,4 +61,4 @@ def hashit(name):
 
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=80)
+    app.run(host="0.0.0.0", port=5000)
diff --git a/app/test/test_simple.py b/test/test_simple.py
similarity index 62%
rename from app/test/test_simple.py
rename to test/test_simple.py
index ea8d0ad..c94268a 100755
--- a/app/test/test_simple.py
+++ b/test/test_simple.py
@@ -1,5 +1,6 @@
 import json
-from app.src.simple import app
+import pytest
+from service.simple import app, hashit
 
 
 class TestSimple:
@@ -24,3 +25,13 @@ class TestSimple:
         resp = self.app.get('/randoms')
         rjson = json.loads(resp.data)
         assert len(rjson['string']) <= 80
+
+    @pytest.mark.skip(reason="hash values diverge during unit testing")
+    def test_hashit(self):
+        test_name = "George"
+        test_hash = "-127751659231289515"
+        response = hashit(test_name)
+        response_hash = response["hash"]
+        assert response_hash == test_hash
+
+