diff --git a/spee.ch/advanced-docker-compose.yml b/spee.ch/.examples/advanced-docker-compose.yml
similarity index 100%
rename from spee.ch/advanced-docker-compose.yml
rename to spee.ch/.examples/advanced-docker-compose.yml
diff --git a/spee.ch/Dockerfile b/spee.ch/Dockerfile
index b42839c..f728fc1 100644
--- a/spee.ch/Dockerfile
+++ b/spee.ch/Dockerfile
@@ -20,14 +20,16 @@ RUN wget -quiet -O /usr/bin/debugpaste https://github.com/nixc-us/debugpaste-it/
 
 ## Install container support files
 RUN curl -s https://raw.githubusercontent.com/leopere/docker-support/master/install | /bin/sh
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
-COPY healthcheck.sh /usr/local/bin/healthcheck
-COPY debugpaste-it.sh /usr/local/bin/debugpaste-it
+COPY ./stuff/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY ./stuff/healthcheck.sh /usr/local/bin/healthcheck
+COPY ./stuff/debugpaste-it.sh /usr/local/bin/debugpaste-it
 
-
-HEALTHCHECK CMD healthcheck
+## TODO: Add debug and stabilize a reasonable HEALTHCHECK
+# HEALTHCHECK CMD healthcheck
 EXPOSE 3000
 USER speech
 WORKDIR /app/
 ENTRYPOINT ["docker-entrypoint"]
+
+## TODO: Add start.sh into $PATH
 CMD ["npm", "run", "start:dev"]
diff --git a/spee.ch/debugpaste-it.sh b/spee.ch/stuff/debugpaste-it.sh
similarity index 100%
rename from spee.ch/debugpaste-it.sh
rename to spee.ch/stuff/debugpaste-it.sh
diff --git a/spee.ch/docker-entrypoint.sh b/spee.ch/stuff/docker-entrypoint.sh
similarity index 100%
rename from spee.ch/docker-entrypoint.sh
rename to spee.ch/stuff/docker-entrypoint.sh
diff --git a/spee.ch/healthcheck.sh b/spee.ch/stuff/healthcheck.sh
similarity index 100%
rename from spee.ch/healthcheck.sh
rename to spee.ch/stuff/healthcheck.sh