diff --git a/A320-main.xml b/A320-main.xml
index 03e26a22..e757369c 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -3950,8 +3950,6 @@
 			<file>Aircraft/A320-family/Nasal/Libraries/property-tree-setup.nas</file>
 		</pts>
 		<libraries>
-			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-main.nas</file>
-			<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
 			<file>Aircraft/A320-family/Nasal/Libraries/libraries.nas</file>
 			<file>Aircraft/A320-family/Nasal/Libraries/buttons.nas</file>
 			<file>Aircraft/A320-family/Nasal/Libraries/shake.nas</file>
@@ -3963,8 +3961,6 @@
 		</acconfig>
 		<systems>
 			<file>Aircraft/A320-family/Nasal/Systems/APU.nas</file>
-			<file>Aircraft/A320-family/Nasal/Effects/effects.nas</file>
-			<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/electrical.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/pneumatics.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/hydraulics.nas</file>
@@ -3973,14 +3969,27 @@
 			<file>Aircraft/A320-family/Nasal/Systems/ADIRS/ADR.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/ADIRS/SwitchingPanel.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/Comm/HF.nas</file>
-			<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/brakes.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/brakesystem.nas</file>
-			<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
-			<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
-			<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
 			<file>Aircraft/A320-family/Nasal/Instruments/clock.nas</file>
+			<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
+			<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
+			<file>Aircraft/A320-family/Nasal/Systems/icing.nas</file>
+			<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
+			<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
 		</systems>
+		<ecam>
+			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-main.nas</file>
+			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-controller.nas</file>
+			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-logic.nas</file>
+			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-messages.nas</file>
+			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-phases.nas</file>
+		</ecam>
+		<effects>
+			<file>Aircraft/A320-family/Nasal/Effects/light-manager.nas</file>
+			<file>Aircraft/A320-family/Nasal/Effects/effects.nas</file>
+			<file>Aircraft/A320-family/Nasal/Effects/thunder-effects.nas</file>
+		</effects>
 		<fadec>
 			<file>Aircraft/A320-family/Nasal/Systems/FADEC/fadec-common.nas</file>
 		</fadec>
@@ -4027,6 +4036,7 @@
 			<file>Aircraft/A320-family/Nasal/MCDU/DATA.nas</file>
 			<file>Aircraft/A320-family/Nasal/MCDU/STATUS.nas</file>
 		</mcdu>
+		<!-- Canvas -->
 		<canvas_pfd>
 			<file>Aircraft/A320-family/Models/Instruments/PFD/PFD.nas</file>
 		</canvas_pfd>
@@ -4043,15 +4053,7 @@
 		<canvas_mcdu>
 			<file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file>
 		</canvas_mcdu>
-		<ecam>
-			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-controller.nas</file>
-			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-logic.nas</file>
-			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-messages.nas</file>
-			<file>Aircraft/A320-family/Nasal/ECAM/ECAM-phases.nas</file>
-		</ecam>
-		<icing>
-			<file>Aircraft/A320-family/Nasal/Systems/icing.nas</file>
-		</icing>
+		<!-- Autopush -->
 		<autopush>
 			<file>Aircraft/A320-family/Nasal/Autopush/autopush.nas</file>
 		</autopush>
@@ -4064,6 +4066,7 @@
 		<autopush_route>
 			<file>Aircraft/A320-family/Nasal/Autopush/autopush_route.nas</file>
 		</autopush_route>
+		<!-- Panels -->
 		<rmp>
 			<file>Aircraft/A320-family/Nasal/Panels/rmp.nas</file>
 		</rmp>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index f80e0583..3514b9bb 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -2023,7 +2023,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("sts");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("sts");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2042,7 +2042,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("apu");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("apu");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2061,7 +2061,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("bleed");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("bleed");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2080,7 +2080,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("press");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("press");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2099,7 +2099,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("elec");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("elec");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2118,7 +2118,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("hyd");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("hyd");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2137,7 +2137,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("fuel");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("fuel");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2156,7 +2156,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("eng");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("eng");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2175,7 +2175,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("cond");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("cond");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2194,7 +2194,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("door");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("door");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2213,7 +2213,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("wheel");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("wheel");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2232,7 +2232,7 @@
 					</greater-than-equals>
 				</condition>
 				<command>nasal</command>
-				<script>libraries.ECAMControlPanel.sysPageBtn("fctl");</script>
+				<script>ecam.ECAMControlPanel.sysPageBtn("fctl");</script>
 			</binding>
 		</action>
 	</animation>
@@ -2502,16 +2502,14 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-					libraries.ECAMControlPanel.rclBtn();
+					ecam.ECAMControlPanel.rclBtn();
 					ecam.FWC.Btn.recall.setValue(1);
 				</script>
 			</binding>
 			<mod-up>
 				<binding>
 					<command>nasal</command>
-					<script>
-						ecam.FWC.Btn.recall.setValue(0);
-					</script>
+					<script>ecam.FWC.Btn.recall.setValue(0);</script>
 				</binding>
 			</mod-up>
 		</action>
@@ -2533,16 +2531,14 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-					libraries.ECAMControlPanel.clrBtn();
+					ecam.ECAMControlPanel.clrBtn();
 					ecam.FWC.Btn.clr.setValue(1);
 				</script>
 			</binding>
 			<mod-up>
 				<binding>
 					<command>nasal</command>
-					<script>
-						ecam.FWC.Btn.clr.setValue(0);
-					</script>
+					<script>ecam.FWC.Btn.clr.setValue(0);</script>
 				</binding>
 			</mod-up>
 		</action>
diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas
index 87affa9a..40d2c25e 100644
--- a/Nasal/ECAM/ECAM-controller.nas
+++ b/Nasal/ECAM/ECAM-controller.nas
@@ -104,7 +104,7 @@ var warning = {
     },
 	callPage: func() {
 		if (me.sdPage == "nil" or me.hasCalled == 1) { return; }
-		libraries.SystemDisplay.failCall(me.sdPage);
+		ecam.SystemDisplay.failCall(me.sdPage);
 		me.hasCalled = 1;
 	}
 };
@@ -336,7 +336,7 @@ var ECAM_controller = {
 		}
 		
 		if (statusFlag == 1 and lines[0].getValue() == "") {
-			libraries.SystemDisplay.manCall("sts");
+			ecam.SystemDisplay.manCall("sts");
 			statusFlag = 0;
 		}
 	},
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index e1e6cd08..bc2419a6 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -1600,13 +1600,13 @@ var messages_right_memo = func {
 		land_asap_a.active = 0;
 	}
 	
-	if (libraries.ap_active == 1 and apWarn.getValue() == 1) {
+	if (ecam.ap_active == 1 and apWarn.getValue() == 1) {
 		ap_off.active = 1;
 	} else {
 		ap_off.active = 0;
 	}
 	
-	if (libraries.athr_active == 1 and athrWarn.getValue() == 1) {
+	if (ecam.athr_active == 1 and athrWarn.getValue() == 1) {
 		athr_off.active = 1;
 	} else {
 		athr_off.active = 0;
diff --git a/Nasal/FMGC/FCU.nas b/Nasal/FMGC/FCU.nas
index b20c65b8..618893bc 100644
--- a/Nasal/FMGC/FCU.nas
+++ b/Nasal/FMGC/FCU.nas
@@ -102,7 +102,7 @@ var FCUController = {
 		if (me.FCUworking and fbw.FBW.activeLaw.getValue() == 0) {
 			if (!ap1.getBoolValue()) {
 				ap1Input.setValue(1);
-				libraries.apWarnNode.setValue(0);
+				ecam.apWarnNode.setValue(0);
 			} else {
 				apOff("hard", 1);
 			}
@@ -489,7 +489,7 @@ var updateActiveFMGC = func {
 # Autopilot Disconnection
 var apOff = func(type, side) {
 	if ((ap1Input.getValue() and (side == 1 or side == 0)) or (ap2Input.getValue() and (side == 2 or side == 0))) {
-		libraries.doApWarn(type);
+		ecam.doApWarn(type);
 	}
 	
 	if (side == 0) {
@@ -509,7 +509,7 @@ var athrOff = func(type) {
 			fadec.lockThr();
 		}
 		athrInput.setValue(0);
-		libraries.doAthrWarn(type);
+		ecam.doAthrWarn(type);
 	}
 }
 
diff --git a/Nasal/FMGC/FMGC.nas b/Nasal/FMGC/FMGC.nas
index 20685267..88c35c04 100644
--- a/Nasal/FMGC/FMGC.nas
+++ b/Nasal/FMGC/FMGC.nas
@@ -788,7 +788,7 @@ var ManagedSPD = maketimer(0.25, func {
 		}
 	} else {
 		ManagedSPD.stop();
-		libraries.mcpSPDKnbPull();
+		fcu.FCUController.SPDPull();
 	}
 });
 
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index 16a9fc2f..fb6c7614 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -195,7 +195,7 @@ var triggerDoor = func(door, doorName, doorDesc) {
 
 var systemsInit = func {
 	fbw.FBW.init();
-	light_manager.init();
+	effects.light_manager.init();
 	systems.ELEC.init();
 	systems.PNEU.init();
 	systems.HYD.init();
@@ -203,8 +203,9 @@ var systemsInit = func {
 	systems.ADIRS.init();
 	systems.eng_init();
 	systems.APUController.init();
-	systems.fire_init();
 	systems.autobrake_init();
+	systems.fire_init();
+	systems.icingInit();
 	fmgc.flightPlanController.reset();
 	fadec.FADEC.init();
 	fmgc.ITAF.init();
@@ -212,9 +213,8 @@ var systemsInit = func {
 	mcdu.MCDU_init(0);
 	mcdu.MCDU_init(1);
 	systemsLoop.start();
-	icing.icingInit();
 	lightsLoop.start();
-	libraries.ECAM.init();
+	ecam.ECAM.init();
 	libraries.variousReset();
 	rmp.init();
 	acp.init();
@@ -235,7 +235,7 @@ var systemsLoop = maketimer(0.1, func {
 	systems.HYD.loop();
 	systems.FUEL.loop();
 	systems.ADIRS.loop();
-	libraries.ECAM.loop();
+	ecam.ECAM.loop();
 	libraries.BUTTONS.update();
 	fadec.FADEC.loop();
 	rmp.rmpUpdate();