diff --git a/src/model/defined-signalboxes.js b/src/model/defs/defined-signalboxes.js
similarity index 100%
rename from src/model/defined-signalboxes.js
rename to src/model/defs/defined-signalboxes.js
diff --git a/src/model/defined-signs.js b/src/model/defs/defined-signs.js
similarity index 100%
rename from src/model/defined-signs.js
rename to src/model/defs/defined-signs.js
diff --git a/src/model/defined-switches.js b/src/model/defs/defined-switches.js
similarity index 99%
rename from src/model/defined-switches.js
rename to src/model/defs/defined-switches.js
index f6618a4..4697f3e 100644
--- a/src/model/defined-switches.js
+++ b/src/model/defs/defined-switches.js
@@ -1,4 +1,4 @@
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 const DefinedSwitches = {
     "Crossing": [
diff --git a/src/model/scenery-parser.js b/src/model/scenery-parser.js
index b006ed3..f9a9fe8 100644
--- a/src/model/scenery-parser.js
+++ b/src/model/scenery-parser.js
@@ -1,23 +1,23 @@
 import Scenery from './scenery';
 import { tracksConnectionTest } from './tracks-connection-test';
 import Switch from './switch';
-import StandardTrack from './standard-track';
-import BezierTrack from './bezier-track';
-import TrackObject from './track-object';
-import Signal from './signal';
+import StandardTrack from './tracks/standard-track';
+import BezierTrack from './tracks/bezier-track';
+import TrackObject from './track-objects/track-object';
+import Signal from './track-objects/signal';
 import Route from './route';
 import Misc from './misc';
 import SceneryParserLog from './scenery-parser-log';
 import SignalBox from './signalbox';
 import Constants from '../helpers/constants';
-import SceneryInfo from './scenery-info';
-import Sign from './sign';
-import CameraHome from './camera-home';
-import MainCamera from './main-camera';
+import SceneryInfo from './special-objects/scenery-info';
+import Sign from './track-objects/sign';
+import CameraHome from './special-objects/camera-home';
+import MainCamera from './special-objects/main-camera';
 import ElectrificationResolver from './electrification-resolver';
-import NEVP from './nevp';
-import Derailer from './derailer';
-import SpawnPoint from './spawn-point';
+import NEVP from './track-objects/nevp';
+import Derailer from './track-objects/derailer';
+import SpawnPoint from './track-objects/spawn-point';
 
 /*
 TODO: add support for WorldRotation and WorldTranslation
diff --git a/src/model/signalbox.js b/src/model/signalbox.js
index 21d7569..ac06b0f 100644
--- a/src/model/signalbox.js
+++ b/src/model/signalbox.js
@@ -1,7 +1,7 @@
 import Misc from "./misc.js";
 import SceneryParserLog from "./scenery-parser-log.js";
 import Vector3 from "./vector3.js";
-import DefinedSignalBoxes from "./defined-signalboxes.js";
+import DefinedSignalBoxes from "./defs/defined-signalboxes.js";
 
 export default class SignalBox extends Misc {
     type = "SignalBox";
diff --git a/src/model/camera-home.js b/src/model/special-objects/camera-home.js
similarity index 93%
rename from src/model/camera-home.js
rename to src/model/special-objects/camera-home.js
index 1e54131..146ae7f 100644
--- a/src/model/camera-home.js
+++ b/src/model/special-objects/camera-home.js
@@ -1,5 +1,5 @@
 import SpecialObject from "./special-object.js";
-import Vector3 from "./vector3.js";
+import Vector3 from "../vector3.js";
 
 export default class CameraHome extends SpecialObject {
     pos;
diff --git a/src/model/main-camera.js b/src/model/special-objects/main-camera.js
similarity index 93%
rename from src/model/main-camera.js
rename to src/model/special-objects/main-camera.js
index a1c514f..4a4010f 100644
--- a/src/model/main-camera.js
+++ b/src/model/special-objects/main-camera.js
@@ -1,5 +1,5 @@
 import SpecialObject from "./special-object.js";
-import Vector3 from "./vector3.js";
+import Vector3 from "../vector3.js";
 
 export default class MainCamera extends SpecialObject {
     pos;
diff --git a/src/model/scenery-info.js b/src/model/special-objects/scenery-info.js
similarity index 100%
rename from src/model/scenery-info.js
rename to src/model/special-objects/scenery-info.js
diff --git a/src/model/special-object.js b/src/model/special-objects/special-object.js
similarity index 100%
rename from src/model/special-object.js
rename to src/model/special-objects/special-object.js
diff --git a/src/model/switch.js b/src/model/switch.js
index 091eb9d..00f5661 100644
--- a/src/model/switch.js
+++ b/src/model/switch.js
@@ -1,8 +1,8 @@
-import PointTrack from "./point-track.js";
+import PointTrack from "./tracks/point-track.js";
 import SceneryObject from "./scenery-object.js";
 import SceneryParserLog from "./scenery-parser-log.js";
 import Vector3 from "./vector3.js";
-import DefinedSwitches from "./defined-switches.js";
+import DefinedSwitches from "./defs/defined-switches.js";
 import Constants from "../helpers/constants.js";
 
 export default class Switch extends SceneryObject {
diff --git a/src/model/derailer.js b/src/model/track-objects/derailer.js
similarity index 95%
rename from src/model/derailer.js
rename to src/model/track-objects/derailer.js
index 61d8be0..67e4ae6 100644
--- a/src/model/derailer.js
+++ b/src/model/track-objects/derailer.js
@@ -1,5 +1,5 @@
 import TrackObject from './track-object';
-import Vector3 from './vector3';
+import Vector3 from '../vector3';
 
 export default class Derailer extends TrackObject {
     type = "Derailer";
diff --git a/src/model/nevp.js b/src/model/track-objects/nevp.js
similarity index 94%
rename from src/model/nevp.js
rename to src/model/track-objects/nevp.js
index a1c26ab..9a4f5c3 100644
--- a/src/model/nevp.js
+++ b/src/model/track-objects/nevp.js
@@ -1,5 +1,5 @@
 import TrackObject from './track-object';
-import Vector3 from './vector3';
+import Vector3 from '../vector3';
 
 export default class NEVP extends TrackObject {
     type = "NEVP";
diff --git a/src/model/sign.js b/src/model/track-objects/sign.js
similarity index 94%
rename from src/model/sign.js
rename to src/model/track-objects/sign.js
index a7defff..d12d413 100644
--- a/src/model/sign.js
+++ b/src/model/track-objects/sign.js
@@ -1,7 +1,7 @@
-import DefinedSigns from "./defined-signs";
-import SceneryParserLog from "./scenery-parser-log";
+import DefinedSigns from "../defs/defined-signs";
+import SceneryParserLog from "../scenery-parser-log";
 import TrackObject from "./track-object";
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 export default class Sign extends TrackObject {
     type = "Sign";
diff --git a/src/model/signal.js b/src/model/track-objects/signal.js
similarity index 95%
rename from src/model/signal.js
rename to src/model/track-objects/signal.js
index 94357dc..a4a40d2 100644
--- a/src/model/signal.js
+++ b/src/model/track-objects/signal.js
@@ -1,7 +1,7 @@
-import SceneryParserLog from "./scenery-parser-log";
-import SpawnInfo from "./spawn-info";
+import SceneryParserLog from "../scenery-parser-log";
+import SpawnInfo from "../spawn-info";
 import TrackObject from "./track-object";
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 export default class Signal extends TrackObject {
     is_spawn;
diff --git a/src/model/spawn-point.js b/src/model/track-objects/spawn-point.js
similarity index 94%
rename from src/model/spawn-point.js
rename to src/model/track-objects/spawn-point.js
index 2b67667..7690402 100644
--- a/src/model/spawn-point.js
+++ b/src/model/track-objects/spawn-point.js
@@ -1,7 +1,7 @@
-import SceneryParserLog from "./scenery-parser-log";
-import SpawnInfo from "./spawn-info";
+import SceneryParserLog from "../scenery-parser-log";
+import SpawnInfo from "../spawn-info";
 import TrackObject from "./track-object";
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 export default class SpawnPoint extends TrackObject {
     is_spawn;
diff --git a/src/model/track-object.js b/src/model/track-objects/track-object.js
similarity index 90%
rename from src/model/track-object.js
rename to src/model/track-objects/track-object.js
index 975eca7..051fc34 100644
--- a/src/model/track-object.js
+++ b/src/model/track-objects/track-object.js
@@ -1,6 +1,6 @@
-import SceneryObject from './scenery-object';
-import SceneryParserLog from './scenery-parser-log';
-import Vector3 from './vector3';
+import SceneryObject from '../scenery-object';
+import SceneryParserLog from '../scenery-parser-log';
+import Vector3 from '../vector3';
 
 export default class TrackObject extends SceneryObject {
     prefab_name;
diff --git a/src/model/bezier-track.js b/src/model/tracks/bezier-track.js
similarity index 97%
rename from src/model/bezier-track.js
rename to src/model/tracks/bezier-track.js
index 68e3683..ce5edb6 100644
--- a/src/model/bezier-track.js
+++ b/src/model/tracks/bezier-track.js
@@ -1,5 +1,5 @@
 import Track from "./track";
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 export default class BezierTrack extends Track
 {
diff --git a/src/model/point-track.js b/src/model/tracks/point-track.js
similarity index 89%
rename from src/model/point-track.js
rename to src/model/tracks/point-track.js
index 6a1836d..0cd63aa 100644
--- a/src/model/point-track.js
+++ b/src/model/tracks/point-track.js
@@ -1,6 +1,6 @@
-import AngleHelper from '../helpers/angleHelper';
+import AngleHelper from '../../helpers/angleHelper';
 import Track from './track';
-import Vector3 from './vector3';
+import Vector3 from '../vector3';
 
 export default class PointTrack extends Track
 {
diff --git a/src/model/standard-track.js b/src/model/tracks/standard-track.js
similarity index 96%
rename from src/model/standard-track.js
rename to src/model/tracks/standard-track.js
index daf0606..2f32478 100644
--- a/src/model/standard-track.js
+++ b/src/model/tracks/standard-track.js
@@ -1,6 +1,6 @@
-import AngleHelper from "../helpers/angleHelper";
+import AngleHelper from "../../helpers/angleHelper";
 import Track from "./track";
-import Vector3 from "./vector3";
+import Vector3 from "../vector3";
 
 export default class StandardTrack extends Track
 {
diff --git a/src/model/track.js b/src/model/tracks/track.js
similarity index 91%
rename from src/model/track.js
rename to src/model/tracks/track.js
index 8b0863c..caa8a4d 100644
--- a/src/model/track.js
+++ b/src/model/tracks/track.js
@@ -1,5 +1,5 @@
-import SceneryObject from "./scenery-object";
-import { ElectrificationStatus } from "./electrification-status";
+import SceneryObject from "../scenery-object";
+import { ElectrificationStatus } from "../electrification-status";
 
 export default class Track extends SceneryObject {
     len;