diff --git a/data/obstacles/_readme.txt b/data/models/obstacles/_readme.txt
similarity index 100%
rename from data/obstacles/_readme.txt
rename to data/models/obstacles/_readme.txt
diff --git a/data/obstacles/obstacle1.mesh b/data/models/obstacles/obstacle1.mesh
similarity index 100%
rename from data/obstacles/obstacle1.mesh
rename to data/models/obstacles/obstacle1.mesh
diff --git a/data/obstacles/obstacle2.mesh b/data/models/obstacles/obstacle2.mesh
similarity index 100%
rename from data/obstacles/obstacle2.mesh
rename to data/models/obstacles/obstacle2.mesh
diff --git a/data/obstacles/obstacle3.mesh b/data/models/obstacles/obstacle3.mesh
similarity index 100%
rename from data/obstacles/obstacle3.mesh
rename to data/models/obstacles/obstacle3.mesh
diff --git a/data/obstacles/obstacle4.mesh b/data/models/obstacles/obstacle4.mesh
similarity index 100%
rename from data/obstacles/obstacle4.mesh
rename to data/models/obstacles/obstacle4.mesh
diff --git a/data/obstacles/obstacle5.mesh b/data/models/obstacles/obstacle5.mesh
similarity index 100%
rename from data/obstacles/obstacle5.mesh
rename to data/models/obstacles/obstacle5.mesh
diff --git a/data/obstacles/obstacle6.mesh b/data/models/obstacles/obstacle6.mesh
similarity index 100%
rename from data/obstacles/obstacle6.mesh
rename to data/models/obstacles/obstacle6.mesh
diff --git a/data/obstacles/obstacle7.mesh b/data/models/obstacles/obstacle7.mesh
similarity index 100%
rename from data/obstacles/obstacle7.mesh
rename to data/models/obstacles/obstacle7.mesh
diff --git a/data/obstacles/obstacle8.mesh b/data/models/obstacles/obstacle8.mesh
similarity index 100%
rename from data/obstacles/obstacle8.mesh
rename to data/models/obstacles/obstacle8.mesh
diff --git a/data/obstacles/obstacleAnomaly1.mesh b/data/models/obstacles/obstacleAnomaly1.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly1.mesh
rename to data/models/obstacles/obstacleAnomaly1.mesh
diff --git a/data/obstacles/obstacleAnomaly2.mesh b/data/models/obstacles/obstacleAnomaly2.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly2.mesh
rename to data/models/obstacles/obstacleAnomaly2.mesh
diff --git a/data/obstacles/obstacleAnomaly3.mesh b/data/models/obstacles/obstacleAnomaly3.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly3.mesh
rename to data/models/obstacles/obstacleAnomaly3.mesh
diff --git a/data/obstacles/obstacleAnomaly4.mesh b/data/models/obstacles/obstacleAnomaly4.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly4.mesh
rename to data/models/obstacles/obstacleAnomaly4.mesh
diff --git a/data/obstacles/obstacleAnomaly5.mesh b/data/models/obstacles/obstacleAnomaly5.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly5.mesh
rename to data/models/obstacles/obstacleAnomaly5.mesh
diff --git a/data/obstacles/obstacleAnomaly6.mesh b/data/models/obstacles/obstacleAnomaly6.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly6.mesh
rename to data/models/obstacles/obstacleAnomaly6.mesh
diff --git a/data/obstacles/obstacleAnomaly7.mesh b/data/models/obstacles/obstacleAnomaly7.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly7.mesh
rename to data/models/obstacles/obstacleAnomaly7.mesh
diff --git a/data/obstacles/obstacleAnomaly8.mesh b/data/models/obstacles/obstacleAnomaly8.mesh
similarity index 100%
rename from data/obstacles/obstacleAnomaly8.mesh
rename to data/models/obstacles/obstacleAnomaly8.mesh
diff --git a/data/obstacles/obstacleRing.mesh b/data/models/obstacles/obstacleRing.mesh
similarity index 100%
rename from data/obstacles/obstacleRing.mesh
rename to data/models/obstacles/obstacleRing.mesh
diff --git a/data/obstacles/obstacleRingAnomaly.mesh b/data/models/obstacles/obstacleRingAnomaly.mesh
similarity index 100%
rename from data/obstacles/obstacleRingAnomaly.mesh
rename to data/models/obstacles/obstacleRingAnomaly.mesh
diff --git a/data/obstacles/obstacle_twisted1L.mesh b/data/models/obstacles/obstacle_twisted1L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted1L.mesh
rename to data/models/obstacles/obstacle_twisted1L.mesh
diff --git a/data/obstacles/obstacle_twisted1R.mesh b/data/models/obstacles/obstacle_twisted1R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted1R.mesh
rename to data/models/obstacles/obstacle_twisted1R.mesh
diff --git a/data/obstacles/obstacle_twisted2L.mesh b/data/models/obstacles/obstacle_twisted2L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted2L.mesh
rename to data/models/obstacles/obstacle_twisted2L.mesh
diff --git a/data/obstacles/obstacle_twisted2R.mesh b/data/models/obstacles/obstacle_twisted2R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted2R.mesh
rename to data/models/obstacles/obstacle_twisted2R.mesh
diff --git a/data/obstacles/obstacle_twisted3L.mesh b/data/models/obstacles/obstacle_twisted3L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted3L.mesh
rename to data/models/obstacles/obstacle_twisted3L.mesh
diff --git a/data/obstacles/obstacle_twisted3R.mesh b/data/models/obstacles/obstacle_twisted3R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twisted3R.mesh
rename to data/models/obstacles/obstacle_twisted3R.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly1L.mesh b/data/models/obstacles/obstacle_twistedAnomaly1L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly1L.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly1L.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly1R.mesh b/data/models/obstacles/obstacle_twistedAnomaly1R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly1R.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly1R.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly2L.mesh b/data/models/obstacles/obstacle_twistedAnomaly2L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly2L.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly2L.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly2R.mesh b/data/models/obstacles/obstacle_twistedAnomaly2R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly2R.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly2R.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly3L.mesh b/data/models/obstacles/obstacle_twistedAnomaly3L.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly3L.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly3L.mesh
diff --git a/data/obstacles/obstacle_twistedAnomaly3R.mesh b/data/models/obstacles/obstacle_twistedAnomaly3R.mesh
similarity index 100%
rename from data/obstacles/obstacle_twistedAnomaly3R.mesh
rename to data/models/obstacles/obstacle_twistedAnomaly3R.mesh
diff --git a/data/obstacles/obstaclesAnomaly_d.jpg b/data/models/obstacles/obstaclesAnomaly_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesAnomaly_d.jpg
rename to data/models/obstacles/obstaclesAnomaly_d.jpg
diff --git a/data/obstacles/obstaclesCrystal_d.jpg b/data/models/obstacles/obstaclesCrystal_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesCrystal_d.jpg
rename to data/models/obstacles/obstaclesCrystal_d.jpg
diff --git a/data/obstacles/obstaclesCrystal_n.jpg b/data/models/obstacles/obstaclesCrystal_n.jpg
similarity index 100%
rename from data/obstacles/obstaclesCrystal_n.jpg
rename to data/models/obstacles/obstaclesCrystal_n.jpg
diff --git a/data/obstacles/obstaclesCrystal_s.jpg b/data/models/obstacles/obstaclesCrystal_s.jpg
similarity index 100%
rename from data/obstacles/obstaclesCrystal_s.jpg
rename to data/models/obstacles/obstaclesCrystal_s.jpg
diff --git a/data/obstacles/obstaclesGreen_d.jpg b/data/models/obstacles/obstaclesGreen_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesGreen_d.jpg
rename to data/models/obstacles/obstaclesGreen_d.jpg
diff --git a/data/obstacles/obstaclesGreen_s.jpg b/data/models/obstacles/obstaclesGreen_s.jpg
similarity index 100%
rename from data/obstacles/obstaclesGreen_s.jpg
rename to data/models/obstacles/obstaclesGreen_s.jpg
diff --git a/data/obstacles/obstaclesGrey_d.jpg b/data/models/obstacles/obstaclesGrey_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesGrey_d.jpg
rename to data/models/obstacles/obstaclesGrey_d.jpg
diff --git a/data/obstacles/obstaclesGrey_n.jpg b/data/models/obstacles/obstaclesGrey_n.jpg
similarity index 100%
rename from data/obstacles/obstaclesGrey_n.jpg
rename to data/models/obstacles/obstaclesGrey_n.jpg
diff --git a/data/obstacles/obstaclesGrey_s.jpg b/data/models/obstacles/obstaclesGrey_s.jpg
similarity index 100%
rename from data/obstacles/obstaclesGrey_s.jpg
rename to data/models/obstacles/obstaclesGrey_s.jpg
diff --git a/data/obstacles/obstaclesMarble_d.jpg b/data/models/obstacles/obstaclesMarble_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesMarble_d.jpg
rename to data/models/obstacles/obstaclesMarble_d.jpg
diff --git a/data/obstacles/obstaclesMarble_n.jpg b/data/models/obstacles/obstaclesMarble_n.jpg
similarity index 100%
rename from data/obstacles/obstaclesMarble_n.jpg
rename to data/models/obstacles/obstaclesMarble_n.jpg
diff --git a/data/obstacles/obstaclesMarble_s.jpg b/data/models/obstacles/obstaclesMarble_s.jpg
similarity index 100%
rename from data/obstacles/obstaclesMarble_s.jpg
rename to data/models/obstacles/obstaclesMarble_s.jpg
diff --git a/data/obstacles/obstaclesWhite_d.jpg b/data/models/obstacles/obstaclesWhite_d.jpg
similarity index 100%
rename from data/obstacles/obstaclesWhite_d.jpg
rename to data/models/obstacles/obstaclesWhite_d.jpg
diff --git a/data/obstacles/obstaclesWhite_s.jpg b/data/models/obstacles/obstaclesWhite_s.jpg
similarity index 100%
rename from data/obstacles/obstaclesWhite_s.jpg
rename to data/models/obstacles/obstaclesWhite_s.jpg