diff --git a/telematrix.py b/telematrix.py
new file mode 100644
index 0000000..6193533
--- /dev/null
+++ b/telematrix.py
@@ -0,0 +1,4 @@
+import telematrix
+
+if __name__ == '__main__':
+    telematrix.main()
diff --git a/app_service.py b/telematrix/__init__.py
similarity index 99%
rename from app_service.py
rename to telematrix/__init__.py
index b14d330..7ad7953 100644
--- a/app_service.py
+++ b/telematrix/__init__.py
@@ -16,7 +16,7 @@ from aiohttp import web, ClientSession
 from aiotg import Bot
 from bs4 import BeautifulSoup
 
-import database as db
+import telematrix.database as db
 
 # Read the configuration file
 try:
diff --git a/database.py b/telematrix/database.py
similarity index 100%
rename from database.py
rename to telematrix/database.py