diff --git a/js/models/dmaBeam.js b/js/fea/dmaBeam.js
similarity index 100%
rename from js/models/dmaBeam.js
rename to js/fea/dmaBeam.js
diff --git a/js/models/dmaCell.js b/js/fea/dmaCell.js
similarity index 100%
rename from js/models/dmaCell.js
rename to js/fea/dmaCell.js
diff --git a/js/models/dmaNode.js b/js/fea/dmaNode.js
similarity index 100%
rename from js/models/dmaNode.js
rename to js/fea/dmaNode.js
diff --git a/js/models/dmaPart.js b/js/fea/dmaPart.js
similarity index 100%
rename from js/models/dmaPart.js
rename to js/fea/dmaPart.js
diff --git a/js/main.js b/js/main.js
index d11e8da7b724c4f29f996fb7391cb6324fd49c37..c171dfe81c3a50a93f295aef506f5a3e01255138 100644
--- a/js/main.js
+++ b/js/main.js
@@ -12,18 +12,12 @@ $(function(){
 
     //init models and views
     var fillGeometry = new FillGeometry();//singleton, mesh to fill with lattice
-    three.setFillGeometry(fillGeometry);
     new ImportView({model: fillGeometry});
-
-    lattice = new Lattice();
-
-
-
-
-
-    setupNavBar(three);
+    three.setFillGeometry(fillGeometry);
 
 
+    lattice = new Lattice();
 
 
+    setupNavBar(threeModel);
 });