diff --git a/rack/sideWall.scad b/rack/side/sideWall.scad
similarity index 77%
rename from rack/sideWall.scad
rename to rack/side/sideWall.scad
index ef4061a..a49301a 100644
--- a/rack/sideWall.scad
+++ b/rack/side/sideWall.scad
@@ -1,25 +1,14 @@
-include <../helper/math.scad>
-include <../helper/halfspace.scad>
-include <../misc/magnet.scad>
-include <./config.scad>
-include <./mainRail.scad>
-include <./side/sideWallMagnetMount.scad>
-include <./sharedVariables.scad>
+include <../../helper/math.scad>
+include <../../helper/halfspace.scad>
+include <../../misc/magnet.scad>
+include <../config.scad>
 
-include <./side/magnetModule.scad>
-include <./side/hingeModule.scad>
+include <./sideWallMagnetMount.scad>
+include <./sideWallVariables.scad>
+include <../sharedVariables.scad>
 
-
-sideWallZGapClearance = 0.2;
-sideWallZ = railTotalHeight - 2*(railFootThickness + sideWallZGapClearance);
-
-sideWallY = yBarDepth;
-
-sideWallXGapClearance = 0.2;
-sideWallX = (yBarWidth-(railTotalWidth+railSlotToInnerYEdge)) - sideWallXGapClearance;
-
-hingePoleDx = hingePoleToConnectorOuterYZFace + sideWallSlotToOuterYEdge;
-hingePoleDy = hingePoleToConnectorOuterXZFace + sideWallSlotToOuterXEdge;
+include <./magnetModule.scad>
+include <./hingeModule.scad>
 
 echo("Side Wall Height", sideWallZ);
 echo("Side Wall Depth", sideWallY);
@@ -29,7 +18,7 @@ module sideWall() {
   applyHingeConnector()
   applyMagnetConnector()
   applyEpicVentilation()
-  applyHingeHandle()
+  applyHandle()
   sideWallBase();
 
   module sideWallBase() {
@@ -118,7 +107,7 @@ module sideWall() {
     children(0);
   }
 
-  module applyHingeHandle() {
+  module applyHandle() {
     children(0);
   }
 }
@@ -128,8 +117,8 @@ sideWall();
 
 translate(v=[10,sideWallSlotToXZ,-2])
 mirror(v=[1,0,0])
-magnetModule();
+*magnetModule();
 
 translate(v=[3,100,0])
 mirror(v=[0,1,0])
-hingeModule();
+*hingeModule();
diff --git a/rack/side/sideWallVariables.scad b/rack/side/sideWallVariables.scad
index f8990f0..ca45859 100644
--- a/rack/side/sideWallVariables.scad
+++ b/rack/side/sideWallVariables.scad
@@ -2,7 +2,6 @@
 include <../config.scad>
 include <../sharedVariables.scad>
 
-
 sideWallConnW = 7;
 sideWallConnD = 20;
 sideWallConnH = 2;
@@ -24,4 +23,15 @@ hingePoleH = 5;
 hingeHoleR = hingePoleR + 0.2;
 
 hingePoleToConnectorOuterYZFace = hingePoleR/2;
-hingePoleToConnectorOuterXZFace = hingePoleR/2;
\ No newline at end of file
+hingePoleToConnectorOuterXZFace = hingePoleR/2;
+
+sideWallZGapClearance = 0.2;
+sideWallZ = railTotalHeight - 2*(railFootThickness + sideWallZGapClearance);
+
+sideWallY = yBarDepth;
+
+sideWallXGapClearance = 0.2;
+sideWallX = (yBarWidth-(railTotalWidth+railSlotToInnerYEdge)) - sideWallXGapClearance;
+
+hingePoleDx = hingePoleToConnectorOuterYZFace + sideWallSlotToOuterYEdge;
+hingePoleDy = hingePoleToConnectorOuterXZFace + sideWallSlotToOuterXEdge;