diff --git a/apps/startup/__init__.py b/apps/startup/__init__.py
new file mode 100644
index 0000000..88cfe90
--- /dev/null
+++ b/apps/startup/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'apps.startup.apps.MyAppConfig'
diff --git a/startupApp/admin.py b/apps/startup/admin.py
similarity index 100%
rename from startupApp/admin.py
rename to apps/startup/admin.py
diff --git a/startupApp/apps.py b/apps/startup/apps.py
similarity index 71%
rename from startupApp/apps.py
rename to apps/startup/apps.py
index 858bfdf..da34cfa 100644
--- a/startupApp/apps.py
+++ b/apps/startup/apps.py
@@ -1,15 +1,14 @@
 from django.apps import AppConfig
-from ticketscraping.scraping import start
+from ..ticketscraping.scraping import start
 from datetime import datetime
 from threading import Thread
 
 
 class MyAppConfig(AppConfig):
-   name = "startupApp"
+   name = "apps.startup"
    verbose_name = "start tmtracker"
 
    def ready(self):
       print(
           f"server started at {datetime.now().strftime('%d/%m/%Y %H:%M:%S')}")
-      print("=== database connection is established ===")
       Thread(target=start).start()
diff --git a/startupApp/migrations/__init__.py b/apps/startup/migrations/__init__.py
similarity index 100%
rename from startupApp/migrations/__init__.py
rename to apps/startup/migrations/__init__.py
diff --git a/startupApp/models.py b/apps/startup/models.py
similarity index 100%
rename from startupApp/models.py
rename to apps/startup/models.py
diff --git a/startupApp/tests.py b/apps/startup/tests.py
similarity index 100%
rename from startupApp/tests.py
rename to apps/startup/tests.py
diff --git a/startupApp/views.py b/apps/startup/views.py
similarity index 100%
rename from startupApp/views.py
rename to apps/startup/views.py
diff --git a/storage/base.py b/apps/storage/base.py
similarity index 100%
rename from storage/base.py
rename to apps/storage/base.py
diff --git a/storage/storage.py b/apps/storage/storage.py
similarity index 100%
rename from storage/storage.py
rename to apps/storage/storage.py
diff --git a/ticketscraping/README.md b/apps/ticketscraping/README.md
similarity index 100%
rename from ticketscraping/README.md
rename to apps/ticketscraping/README.md
diff --git a/ticketscraping/constants.py b/apps/ticketscraping/constants.py
similarity index 100%
rename from ticketscraping/constants.py
rename to apps/ticketscraping/constants.py
diff --git a/ticketscraping/js/injector-header.js b/apps/ticketscraping/js/injector-header.js
similarity index 100%
rename from ticketscraping/js/injector-header.js
rename to apps/ticketscraping/js/injector-header.js
diff --git a/ticketscraping/js/injector.js b/apps/ticketscraping/js/injector.js
similarity index 100%
rename from ticketscraping/js/injector.js
rename to apps/ticketscraping/js/injector.js
diff --git a/ticketscraping/js/package-lock.json b/apps/ticketscraping/js/package-lock.json
similarity index 100%
rename from ticketscraping/js/package-lock.json
rename to apps/ticketscraping/js/package-lock.json
diff --git a/ticketscraping/js/package.json b/apps/ticketscraping/js/package.json
similarity index 100%
rename from ticketscraping/js/package.json
rename to apps/ticketscraping/js/package.json
diff --git a/ticketscraping/prepare_reese84token.py b/apps/ticketscraping/prepare_reese84token.py
similarity index 100%
rename from ticketscraping/prepare_reese84token.py
rename to apps/ticketscraping/prepare_reese84token.py
diff --git a/ticketscraping/scraping.py b/apps/ticketscraping/scraping.py
similarity index 99%
rename from ticketscraping/scraping.py
rename to apps/ticketscraping/scraping.py
index f367e3c..0b18d5c 100644
--- a/ticketscraping/scraping.py
+++ b/apps/ticketscraping/scraping.py
@@ -7,7 +7,7 @@
 from . import constants
 from threading import Semaphore
 from .prepare_reese84token import getReese84Token
-from storage.storage import *
+from ..storage.storage import *
 from .seat_analysis import store_seats
 
 class Reese84TokenUpdating():
diff --git a/ticketscraping/seat_analysis.py b/apps/ticketscraping/seat_analysis.py
similarity index 97%
rename from ticketscraping/seat_analysis.py
rename to apps/ticketscraping/seat_analysis.py
index 4fb884d..9be47b4 100644
--- a/ticketscraping/seat_analysis.py
+++ b/apps/ticketscraping/seat_analysis.py
@@ -1,6 +1,6 @@
 from dateutil import parser
-from storage.storage import insert_one
-import ticketscraping.constants as constants
+from ..storage.storage import insert_one
+from ..ticketscraping import constants
 
 
 def store_seats(data, scheduler_config):
diff --git a/trackerapi/__init__.py b/apps/trackerapi/__init__.py
similarity index 100%
rename from trackerapi/__init__.py
rename to apps/trackerapi/__init__.py
diff --git a/trackerapi/admin.py b/apps/trackerapi/admin.py
similarity index 100%
rename from trackerapi/admin.py
rename to apps/trackerapi/admin.py
diff --git a/trackerapi/apps.py b/apps/trackerapi/apps.py
similarity index 81%
rename from trackerapi/apps.py
rename to apps/trackerapi/apps.py
index 1b6a00e..c0a27b6 100644
--- a/trackerapi/apps.py
+++ b/apps/trackerapi/apps.py
@@ -3,4 +3,4 @@
 
 class TrackerapiConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'trackerapi'
+    name = 'apps.trackerapi'
diff --git a/trackerapi/migrations/__init__.py b/apps/trackerapi/migrations/__init__.py
similarity index 100%
rename from trackerapi/migrations/__init__.py
rename to apps/trackerapi/migrations/__init__.py
diff --git a/trackerapi/models.py b/apps/trackerapi/models.py
similarity index 100%
rename from trackerapi/models.py
rename to apps/trackerapi/models.py
diff --git a/trackerapi/tests.py b/apps/trackerapi/tests.py
similarity index 100%
rename from trackerapi/tests.py
rename to apps/trackerapi/tests.py
diff --git a/trackerapi/urls.py b/apps/trackerapi/urls.py
similarity index 100%
rename from trackerapi/urls.py
rename to apps/trackerapi/urls.py
diff --git a/trackerapi/views.py b/apps/trackerapi/views.py
similarity index 92%
rename from trackerapi/views.py
rename to apps/trackerapi/views.py
index 387cf8e..635d7d2 100644
--- a/trackerapi/views.py
+++ b/apps/trackerapi/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from django.http import HttpResponse, HttpRequest
-from storage.storage import insert_one, find_one_and_update
-import ticketscraping.constants as constants
+from ..storage.storage import insert_one, find_one_and_update
+from ..ticketscraping import constants
 import json
 
 
diff --git a/secret.py b/secret.py
index b99bdc6..ed02f63 100644
--- a/secret.py
+++ b/secret.py
@@ -1,3 +1,3 @@
 import os
 
-CONN_SRV = os.environ.get('CONN_SRV')
+CONN_SRV = os.environ.get('CONN_SRV')
\ No newline at end of file
diff --git a/startupApp/__init__.py b/startupApp/__init__.py
deleted file mode 100644
index eaeb9c6..0000000
--- a/startupApp/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'startupApp.apps.MyAppConfig'
diff --git a/tmtracker/settings.py b/tmtracker/settings.py
index 1af2c7e..8c06096 100644
--- a/tmtracker/settings.py
+++ b/tmtracker/settings.py
@@ -32,8 +32,8 @@
     'django.contrib.contenttypes',
     # 'django.contrib.messages',
     'django.contrib.staticfiles',
-    'startupApp',
-    'trackerapi',
+    'apps.startup',
+    'apps.trackerapi',
 ]
 
 MIDDLEWARE = [
diff --git a/tmtracker/urls.py b/tmtracker/urls.py
index b2d96c4..4564c95 100644
--- a/tmtracker/urls.py
+++ b/tmtracker/urls.py
@@ -16,5 +16,5 @@
 from django.urls import path, include
 
 urlpatterns = [
-    path('tracker-api/', include('trackerapi.urls'))
+    path('tracker-api/', include('apps.trackerapi.urls'))
 ]
diff --git a/utils.py b/utils.py
index d642c42..4f1ced6 100644
--- a/utils.py
+++ b/utils.py
@@ -2,6 +2,7 @@
 from secret import CONN_SRV
 
 client = MongoClient(CONN_SRV)
+print("=== database connection is established ===")
 
 def get_db_handle(db_name):
     global client