diff --git a/.gitignore b/.gitignore
index 5ff7506142e8f58ea3028f10e3356b3e650954e2..58ff2f2f28e1e84afa35d9247288d3b21063dac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1145,3 +1145,4 @@ dump.rdb
 /logfile4.txt
 /logfile5.txt
 /logfile*.txt
+/src/covid19/static/vendor/
diff --git a/src/app.py b/src/app.py
deleted file mode 100644
index 187b2dd45b8d221e91c13193591dd096a93f1d2d..0000000000000000000000000000000000000000
--- a/src/app.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import sys
-import subprocess
-import covid19
-from covid19.blueprints.application.application_workers import app, run_app, celery
-
-# ---------------------------------------------------------------------------------
-#  MAIN
-# ---------------------------------------------------------------------------------
-
-if __name__ == '__main__':
-    run_app(app)
diff --git a/src/conftest.py b/src/conftest.py
deleted file mode 100644
index 40f1f65b35924eaa332d85b29655bbe799e6d72d..0000000000000000000000000000000000000000
--- a/src/conftest.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import os
-import tempfile
-import pytest
-from database import create_app, create_db_test, create_admin
-
-pytest_plugins = ("celery.contrib.pytest", )
-
-
-@pytest.fixture
-def app():
-    app = create_app()
-    return app
-
-
-@pytest.fixture
-def client():
-    app = create_app()
-    db_fd, app.config['DATABASE'] = tempfile.mkstemp()
-    app.config['TESTING'] = True
-
-    with app.test_client() as client:
-        with app.app_context():
-            create_db_test(app)
-            create_admin(app)
-        yield client
-
-    os.close(db_fd)
-    os.unlink(app.config['DATABASE'])
diff --git a/src/covid19/__init__.py b/src/covid19/__init__.py
index 5549a515b79e4aede461987f09bd7e18f59e47ac..1c97c57a57cb1c2a5448ddef7564fa8ec985a9cb 100644
--- a/src/covid19/__init__.py
+++ b/src/covid19/__init__.py
@@ -4,6 +4,7 @@ import covid19.blueprints.application.application_views
 from covid19.blueprints.application.application_services import user_service
 from covid19.blueprints.application.application_service import ApplicationService
 
+
 def run_web():
     application_service = ApplicationService(db, user_service)
     application_service.prepare_run_web()
diff --git a/src/covid19/blueprints/application/application_workers.py b/src/covid19/blueprints/application/application_workers.py
index f6809d65d8715e1919cca9294a93811ffa38cd4f..b7b7ceaf21f0a8a423146b739343afb87873411a 100644
--- a/src/covid19/blueprints/application/application_workers.py
+++ b/src/covid19/blueprints/application/application_workers.py
@@ -5,40 +5,20 @@ from database import create_celery, run_run_with_debug, port, db
 from covid19.blueprints.application.application_services import user_service
 from covid19.blueprints.application.application_service import ApplicationService
 
-def run_mq(my_app, my_celery):
-    application_service = ApplicationService(db, user_service)
+
+def start_redis(application_service):
     if sys.platform != 'linux':
         application_service.prepare_start_redis()
         redis_cmd = ['redis-server']
         # subprocess.Popen(redis_cmd, shell=True)
+
+
+def run_mq(my_app, my_celery):
+    application_service = ApplicationService(db, user_service)
+    start_redis(application_service)
     application_service.prepare_run_mq()
     args = ['worker', '-l', 'INFO']
     my_celery.start(args)
 
 
 celery = create_celery(app)
-
-
-def run_app(my_app):
-    if sys.platform != 'linux':
-        my_app.logger.info("-------------------------------------------------------------")
-        my_app.logger.info("#                start REDIS-Server                         #")
-        my_app.logger.info("-------------------------------------------------------------")
-        redis_cmd = ['redis-server']
-        subprocess.Popen(redis_cmd, shell=True)
-    my_app.logger.info(" ")
-    my_app.logger.info("#############################################################")
-    my_app.logger.info("#                Covid19 Data - WORKER                      #")
-    my_app.logger.info("#############################################################")
-    my_app.logger.info(" ")
-    celery_cmd = ['celery multi start w1 -A app.celery worker -l INFO']
-    #celery_args = ['worker', '-l', 'INFO']
-    subprocess.Popen(celery_cmd, shell=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
-    #my_celery = create_celery(app)
-    #my_celery.start(celery_args)
-    my_app.logger.info(" ")
-    my_app.logger.info("#############################################################")
-    my_app.logger.info("#                Covid19 Data - WEB                         #")
-    my_app.logger.info("#############################################################")
-    my_app.logger.info(" ")
-    my_app.run(debug=run_run_with_debug, port=port, threaded=False)
diff --git a/src/mq/__init__.py b/src/mq/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/run_mq.py b/src/mq/run_mq.py
similarity index 100%
rename from src/run_mq.py
rename to src/mq/run_mq.py
diff --git a/src/run4test_mq.py b/src/run4test_mq.py
deleted file mode 100644
index 88b4f8a579bb39d98afd39cfdc870d344f31ff20..0000000000000000000000000000000000000000
--- a/src/run4test_mq.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import sys
-import subprocess
-import covid19
-from covid19 import app
-from covid19.blueprints.application.application_workers import celery, run_mq
-
-# Celery: https://docs.celeryproject.org/en/stable/userguide/index.html
-
-# ---------------------------------------------------------------------------------
-#  MAIN
-# ---------------------------------------------------------------------------------
-
-if __name__ == '__main__':
-    run_mq(app, celery)
diff --git a/src/run4test_web.py b/src/run4test_web.py
deleted file mode 100644
index c5a38af4303dc10dc3649b81c8870cc90639afd2..0000000000000000000000000000000000000000
--- a/src/run4test_web.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from database import app, run_run_with_debug, port
-import covid19
-import covid19.blueprints.application.application_views
-
-from covid19 import run_web
-
-# https://realpython.com/pytest-python-testing/
-# https://www.guru99.com/pytest-tutorial.html
-#
-#
-# https://docs.pytest.org/en/stable/
-# https://www.jetbrains.com/help/pycharm/pytest.html
-# https://docs.celeryproject.org/en/stable/userguide/testing.html
-#
-# https://werkzeug.palletsprojects.com/en/1.0.x/test/#werkzeug.test.Client
-# https://flask.palletsprojects.com/en/1.1.x/testing/
-# https://flask.palletsprojects.com/en/1.1.x/tutorial/tests/
-#
-# https://flask.palletsprojects.com/en/1.1.x/tutorial/install/
-# https://packaging.python.org/tutorials/packaging-projects/
-
-
-# ---------------------------------------------------------------------------------
-#  MAIN
-# ---------------------------------------------------------------------------------
-
-if __name__ == '__main__':
-    run_web()
diff --git a/src/web/__init__.py b/src/web/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/run_web.py b/src/web/run_web.py
similarity index 100%
rename from src/run_web.py
rename to src/web/run_web.py