diff --git a/.gitignore b/.gitignore
index 79e204d..5365693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
 __pycache__
 dummy.py
 build
-mail4one.pyz
+mail4one*.pyz
 deploy_configs/config.json
diff --git a/Makefile b/Makefile
index 60d3459..5c19b3b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ clean:
 	rm -rf mail4one.pyz
 
 docker-tests:
-	docker run --pull=always -v `pwd`:/app -w /app --rm -it python:3.11-alpine sh runtests.sh
-	docker run --pull=always -v `pwd`:/app -w /app --rm -it python:3.10-alpine sh runtests.sh
-	docker run --pull=always -v `pwd`:/app -w /app --rm -it python:3.11 sh runtests.sh
-	docker run --pull=always -v `pwd`:/app -w /app --rm -it python:3.10 sh runtests.sh
-	docker run --pull=always -v `pwd`:/app -w /app --rm -it python:3.9 sh runtests.sh
+	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11-alpine sh scripts/runtests.sh
+	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10-alpine sh scripts/runtests.sh
+	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.11        sh scripts/runtests.sh
+	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.10        sh scripts/runtests.sh
+	docker run --pull=always -v `pwd`:/app -w /app --rm python:3.9         sh scripts/runtests.sh
 
 # ============================================================================
 
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index fa766ef..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# TODO
-
-DEV
-1. unittests
-1. Web interface
-1. Custom email processing
-1. Refactor smtp controller
-1. pip installable package
-1. Improve logging with timestamp, peer info, stats
-1. custom smtp with auth
-  1. Filter domain name
-  2. Support multiple subdomains and save in different folders
-1. smtp2go integration
-1. metrics
-2. imap
-3. handle connection disconnect
-4. rethink deleted items
-
-MASTER
-1. tests!
-2. docker support
-3. multi domain
-4. [pop] auto delete
-5. [pop] TOP command
-6. merge with cloud_test branch
-
-7. User timeout for POP
-8. unittests
-9. Web interface
-10. Custom email processing
-11. Refactor smtp controller
-12. pip installable package
-13. Listen on port 465 for smtp too
diff --git a/mail4one/__main__.py b/mail4one/__main__.py
deleted file mode 100644
index bc40eef..0000000
--- a/mail4one/__main__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from .server import main
-
-main()
diff --git a/run.py b/run.py
deleted file mode 100644
index cd0035a..0000000
--- a/run.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from mail4one.server import main
-
-main()
diff --git a/scripts/get_version.sh b/scripts/get_version.sh
index 336560f..cc43f17 100755
--- a/scripts/get_version.sh
+++ b/scripts/get_version.sh
@@ -9,7 +9,6 @@ then
 		case "$tag_val" in 
 				*DIRTY)
 						echo "git=$commit-changes"
-						exit
 						;;
 				v*) # Only consider tags starting with v
 						echo "$tag_val"
diff --git a/runtests.sh b/scripts/runtests.sh
similarity index 100%
rename from runtests.sh
rename to scripts/runtests.sh