diff --git a/setup.py b/setup.py
index 9e5c91c..8ac4062 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(
     packages=[
         'SWSCloudCore',
         'SWSCloudCore.controllers',
-        'SWSCloudCore.controllers.administrator',
+        'SWSCloudCore.controllers.administrators',
         'SWSCloudCore.controllers.billing',
         'SWSCloudCore.controllers.common',
         'SWSCloudCore.controllers.containers',
diff --git a/cli-database-init.py b/swscloud-db-init.py
similarity index 85%
rename from cli-database-init.py
rename to swscloud-db-init.py
index af362ae..a2ca406 100644
--- a/cli-database-init.py
+++ b/swscloud-db-init.py
@@ -1,7 +1,9 @@
-from SWSServerCDN import model_cdn
+#!/bin/env python
 
 from SWSCloudCore import models
 
+# TODO: connect to database
+
 models.database.create_tables({
     models.Admins,
     models.DataCenters,
@@ -20,5 +22,6 @@ models.database.create_tables({
     models.ContainersStatistics,
     models.ContainersStatisticsState,
     models.Tasks,
-    model_cdn.CdnZones
 }, safe=True)
+
+# TODO: close connect with database
diff --git a/app.py b/swscloud-runserver.py
similarity index 83%
rename from app.py
rename to swscloud-runserver.py
index 8a79b6e..2a0cbec 100644
--- a/app.py
+++ b/swscloud-runserver.py
@@ -1,3 +1,4 @@
+#!/bin/env python
 # coding: utf-8
 
 from SWSCloudCore import app