diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..2821b7d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.DS_Store
+.idea
+__pycache__
+venv
+venv-test
+# skip the custom envs
+#envs
+# skip the models directory
+models
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker/docker-compose-dev.yml
similarity index 69%
rename from docker-compose-dev.yml
rename to docker/docker-compose-dev.yml
index 89ff41a..b697693 100644
--- a/docker-compose-dev.yml
+++ b/docker/docker-compose-dev.yml
@@ -1,6 +1,6 @@
 services:
-  cogstack-jupyter-hub:
-    build: ./Dockerfile_hub
+  cogstack-jupyter-hub-dev:
+    build: ../Dockerfile_hub
     container_name: cogstack-jupyter-hub-dev
     restart: always
     environment:
@@ -11,19 +11,19 @@ services:
       - JUPYTERHUB_INTERNAL_PROXY_API_PORT=${JUPYTERHUB_INTERNAL_PROXY_API_PORT:-8887}
       - JUPYTERHUB_SSL_PORT=${JUPYTERHUB_SSL_PORT:-443}
     env_file:
-      - ./env/general.env
-      - ./env/jupyter.env
+      - ../env/general.env
+      - ../env/jupyter.env
     volumes:
       - jupyter-hub-shared-scratch:/home/jovyan/scratch
       - jupyter-hub-vol:/srv/jupyterhub
       # Security configs
-      - ./${DEFAULT_SECURITY_DIR:-./security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
-      - ./${DEFAULT_SECURITY_DIR:-./security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
-      - ./config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
+      - ../${DEFAULT_SECURITY_DIR:-./security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
+      - ../${DEFAULT_SECURITY_DIR:-./security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
+      - ../config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
       # User list and jupyter config
-      - ./config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro
-      - ./config/userlist:/srv/jupyterhub/userlist:ro
-      - ./config/teamlist:/srv/jupyterhub/teamlist:ro
+      - ../config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro
+      - ../config/userlist:/srv/jupyterhub/userlist:ro
+      - ../config/teamlist:/srv/jupyterhub/teamlist:ro
       # Give access to Docker socket
       - /var/run/docker.sock:/var/run/docker.sock
     ulimits:
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 73%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 69906e1..08a2e84 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -11,19 +11,19 @@ services:
       - JUPYTERHUB_INTERNAL_PROXY_API_PORT=${JUPYTERHUB_INTERNAL_PROXY_API_PORT:-8887}
       - JUPYTERHUB_SSL_PORT=${JUPYTERHUB_SSL_PORT:-443}
     env_file:
-      - ./env/general.env
-      - ./env/jupyter.env
+      - ../env/general.env
+      - ../env/jupyter.env
     volumes:
       - jupyter-hub-shared-scratch:/home/jovyan/scratch
       - jupyter-hub-vol:/srv/jupyterhub
       # Security configs
-      - ./${DEFAULT_SECURITY_DIR:-./security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
-      - ./${DEFAULT_SECURITY_DIR:-./security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
-      - ./config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
+      - ../${DEFAULT_SECURITY_DIR:-./security/}root-ca.key:/srv/jupyterhub/root-ca.key:ro
+      - ../${DEFAULT_SECURITY_DIR:-./security/}root-ca.pem:/srv/jupyterhub/root-ca.pem:ro
+      - ../config/jupyterhub_cookie_secret:/srv/jupyterhub/jupyterhub_cookie_secret:ro
       # User list and jupyter config
-      - ./config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro
-      - ./config/userlist:/srv/jupyterhub/userlist:ro
-      - ./config/teamlist:/srv/jupyterhub/teamlist:ro
+      - ../config/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro
+      - ../config/userlist:/srv/jupyterhub/userlist:ro
+      - ../config/teamlist:/srv/jupyterhub/teamlist:ro
       # Give access to Docker socket
       - /var/run/docker.sock:/var/run/docker.sock
     ulimits: