diff --git a/README.md b/README.md
index c60a3d7836b1be9b3320f37128a293fceda5b655..1e1ef70105a5d704df5916d095c6b002d560ec3d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 All folders are isolated projects. `cd` into the folder to run/build them.
 
-- `jobs`: jobs to be built as a Docker image
+- `jobs`: jobs contain utility functions
 - `tasks`: a task can be composed of many jobs
 
 ## Getting started with development tools
@@ -27,6 +27,7 @@ All folders are isolated projects. `cd` into the folder to run/build them.
 2. We are storing Docker images at GitLab's integrated container registry by running:
 
         docker login git.imp.fu-berlin.de:5000 -u <GITLAB_USERNAME> -p <TOKEN> 
+
 *Some Project Access Tokens are available and will be provided to members.*
 
 ## Local development
@@ -38,11 +39,11 @@ Jobs and tasks are run inside of docker containers. There is a docker build scri
 
 The image is built now and ready to be used! The tests in the Docker container built from the image can be sanity-checked via :
 
-    docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python jobs/unittests/test_a_job.py
+    docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python jobs/tests/test_a_job.py
 
 or for testing a task:
 
-    docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python tasks/integration-tests/test_a_task.py
+    docker run -it --rm git.imp.fu-berlin.de:5000/comp-sci-project/jobs-n-tasks:local python tasks/tests/test_a_task.py
 
 For live experience (meaning you enter the container), run:
 
diff --git a/jobs/src/__init__.py b/jobs/src/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/jobs/unittests/test_a_job.py b/jobs/tests/test_a_job.py
similarity index 100%
rename from jobs/unittests/test_a_job.py
rename to jobs/tests/test_a_job.py
diff --git a/jobs/unittests/test_bht_algorithm.py b/jobs/tests/test_bht_algorithm.py
similarity index 100%
rename from jobs/unittests/test_bht_algorithm.py
rename to jobs/tests/test_bht_algorithm.py
diff --git a/jobs/unittests/test_integrator.py b/jobs/tests/test_integrator.py
similarity index 100%
rename from jobs/unittests/test_integrator.py
rename to jobs/tests/test_integrator.py
diff --git a/jobs/unittests/test_jpl_data_query.py b/jobs/tests/test_jpl_data_query.py
similarity index 100%
rename from jobs/unittests/test_jpl_data_query.py
rename to jobs/tests/test_jpl_data_query.py
diff --git a/jobs/unittests/__init__.py b/jobs/unittests/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tasks/integration-tests/test_a_task.py b/tasks/tests/test_a_task.py
similarity index 100%
rename from tasks/integration-tests/test_a_task.py
rename to tasks/tests/test_a_task.py
diff --git a/tasks/integration-tests/test_direct_simulation.py b/tasks/tests/test_direct_simulation.py
similarity index 100%
rename from tasks/integration-tests/test_direct_simulation.py
rename to tasks/tests/test_direct_simulation.py
diff --git a/tasks/integration-tests/test_ff_simulation.py b/tasks/tests/test_ff_simulation.py
similarity index 100%
rename from tasks/integration-tests/test_ff_simulation.py
rename to tasks/tests/test_ff_simulation.py