diff --git a/aman/System.py b/aman/AMAN.py
similarity index 87%
rename from aman/System.py
rename to aman/AMAN.py
index 1bb265f..c18439a 100644
--- a/aman/System.py
+++ b/aman/AMAN.py
@@ -7,9 +7,9 @@ import sys
 from aman.com.Euroscope import Euroscope
 from aman.config.AircraftPerformance import AircraftPerformance
 from aman.config.Airport import Airport
-import aman.config.System
+from aman.config.System import System
 
-class System:
+class AMAN:
     def findConfigPath():
         envvar = os.environ.get('AMAN_CONFIG_PATH')
         if None == envvar:
@@ -28,10 +28,10 @@ class System:
         self.aircraftPerformance = None
         self.receiver = None
 
-        configPath = System.findConfigPath()
+        configPath = AMAN.findConfigPath()
 
         # read all system relevant configuration files
-        self.systemConfig = aman.config.System.System(os.path.join(configPath, 'System.ini'))
+        self.systemConfig = System(os.path.join(configPath, 'System.ini'))
         print('Parsed System.ini')
 
         # read the aircraft performance data
@@ -50,6 +50,8 @@ class System:
             print('Parsing planner configuration for ' + icao)
             airportConfig = Airport(file, icao)
 
+            # TODO initialize the planner thread
+
         # create the EuroScope receiver
         self.receiver = Euroscope(configPath, self.systemConfig.Server)