diff --git a/inkycal/__init__.py b/inkycal/__init__.py
index 23c7e78..a49e9b7 100644
--- a/inkycal/__init__.py
+++ b/inkycal/__init__.py
@@ -1,10 +1,15 @@
-from inkycal.config import layout
-from inkycal.config import settings_parser
-
+# Settings and Layout
+from inkycal.config.layout import Layout
+from inkycal.config.settings_parser import Settings
 
+# All supported inkycal_modules
 import inkycal.modules.inkycal_agenda
 import inkycal.modules.inkycal_calendar
 import inkycal.modules.inkycal_weather
 import inkycal.modules.inkycal_rss
-#import inkycal.modules.inkycal_image
+# import inkycal.modules.inkycal_image
+# import inkycal.modules.inkycal_server
+
+# Main file
+from inkycal.main import Inkycal