diff --git a/src/fenrir/fenrir.py b/src/fenrir/core/fenrirManager.py
similarity index 99%
rename from src/fenrir/fenrir.py
rename to src/fenrir/core/fenrirManager.py
index bb79d245..d9393987 100644
--- a/src/fenrir/fenrir.py
+++ b/src/fenrir/core/fenrirManager.py
@@ -9,11 +9,12 @@ import __main__
 
 if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
     sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
+
 from core import i18n
 from core import settingsManager
 from core import debug
 
-class fenrir():
+class fenrirManager():
     def __init__(self):
         try:
             self.environment = settingsManager.settingsManager().initFenrirConfig()
diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir
index fce4baac..b29508c9 100755
--- a/src/fenrir/fenrir
+++ b/src/fenrir/fenrir
@@ -10,10 +10,10 @@ import __main__
 if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
     sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
 
-import fenrir
+from core import fenrirManager
 
 def main():
-    app = fenrir.fenrir()
+    app = fenrirManager.fenrirManager()
     app.proceed()
     del app
 
diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon
index 41b3bc27..f4664a9a 100755
--- a/src/fenrir/fenrir-daemon
+++ b/src/fenrir/fenrir-daemon
@@ -10,13 +10,13 @@ import __main__
 if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
     sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
 
-import fenrir
+from core import fenrirManager
 from daemonize import Daemonize
 
 pidFile = "/run/fenrir.pid"
 
 def main():
-    app = fenrir.fenrir()
+    app = fenrirManager.fenrirManager()
     app.proceed()
     del app