diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2c2e090..c05b2505 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,15 +97,15 @@ set(SOURCES
 "world/Track.cpp"
 "world/Traction.cpp"
 "world/TractionPower.cpp"
-"vehicle/Train.cpp"
-"vehicle/Train_Commands_Auxiliary.cpp"
-"vehicle/Train_Commands_Brakes.cpp"
-"vehicle/Train_Commands_Controls.cpp"
-"vehicle/Train_Commands_Doors.cpp"
-"vehicle/Train_Commands_Electrical.cpp"
-"vehicle/Train_Commands_Lights.cpp"
-"vehicle/Train_Commands_Misc.cpp"
-"vehicle/Train_Commands_Radio.cpp"
+"vehicle/train/Train.cpp"
+"vehicle/train/TrainCommandsAuxiliary.cpp"
+"vehicle/train/TrainCommandsBrakes.cpp"
+"vehicle/train/TrainCommandsControls.cpp"
+"vehicle/train/TrainCommandsDoors.cpp"
+"vehicle/train/TrainCommandsElectrical.cpp"
+"vehicle/train/TrainCommandsLights.cpp"
+"vehicle/train/TrainCommandsMisc.cpp"
+"vehicle/train/TrainCommandsRadio.cpp"
 "world/TrkFoll.cpp"
 "vehicle/AirCoupler.cpp"
 "model/AnimModel.cpp"
diff --git a/application/application.cpp b/application/application.cpp
index e5d0b6ba..1d3e8ffe 100644
--- a/application/application.cpp
+++ b/application/application.cpp
@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/utilities.h"
 #include "simulation/simulation.h"
 #include "simulation/simulationsounds.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "utilities/dictionary.h"
 #include "scene/sceneeditor.h"
 #include "rendering/renderer.h"
@@ -26,7 +26,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Logs.h"
 #include "rendering/screenshot.h"
 #include "utilities/translation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "utilities/Timer.h"
 #include "utilities/dictionary.h"
 #include "version_info.h"
diff --git a/application/drivermode.cpp b/application/drivermode.cpp
index 80fd3b17..f4609b2f 100644
--- a/application/drivermode.cpp
+++ b/application/drivermode.cpp
@@ -20,7 +20,7 @@ http://mozilla.org/MPL/2.0/.
 #include "scene/scene.h"
 #include "rendering/lightarray.h"
 #include "rendering/particles.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/Driver.h"
 #include "vehicle/DynObj.h"
 #include "model/Model3d.h"
diff --git a/application/driveruilayer.cpp b/application/driveruilayer.cpp
index 0b8463f8..b6596cc9 100644
--- a/application/driveruilayer.cpp
+++ b/application/driveruilayer.cpp
@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #include "application/application.h"
 #include "utilities/translation.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "model/AnimModel.h"
 #include "rendering/renderer.h"
 
diff --git a/application/driveruipanels.cpp b/application/driveruipanels.cpp
index 729b854c..e199bb35 100644
--- a/application/driveruipanels.cpp
+++ b/application/driveruipanels.cpp
@@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/.
 #include "world/TractionPower.h"
 #include "vehicle/Camera.h"
 #include "world/mtable.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/Driver.h"
 #include "model/AnimModel.h"
 #include "vehicle/DynObj.h"
diff --git a/audio/audiorenderer.cpp b/audio/audiorenderer.cpp
index 81f81570..4c9d449b 100644
--- a/audio/audiorenderer.cpp
+++ b/audio/audiorenderer.cpp
@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
 #include "vehicle/Camera.h"
 #include "utilities/Logs.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 
 namespace audio {
 
diff --git a/audio/sound.cpp b/audio/sound.cpp
index 0ff2eff9..abd7efa5 100644
--- a/audio/sound.cpp
+++ b/audio/sound.cpp
@@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/parser.h"
 #include "utilities/Globals.h"
 #include "vehicle/Camera.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/DynObj.h"
 #include "simulation/simulation.h"
 #include "audio/audiorenderer_extra.h"
diff --git a/input/command.cpp b/input/command.cpp
index 9a373fef..caebce5a 100644
--- a/input/command.cpp
+++ b/input/command.cpp
@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Logs.h"
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 
 namespace simulation {
 
diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp
index 2d5f3d24..d961fea0 100644
--- a/input/drivermouseinput.cpp
+++ b/input/drivermouseinput.cpp
@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Globals.h"
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "model/AnimModel.h"
 #include "rendering/renderer.h"
 #include "application/uilayer.h"
diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp
index 576cf404..55393032 100644
--- a/rendering/opengl33renderer.cpp
+++ b/rendering/opengl33renderer.cpp
@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/color.h"
 #include "utilities/Globals.h"
 #include "utilities/Timer.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/Camera.h"
 #include "simulation/simulation.h"
 #include "utilities/Logs.h"
diff --git a/rendering/openglrenderer.cpp b/rendering/openglrenderer.cpp
index d159c31a..9cebd1b5 100644
--- a/rendering/openglrenderer.cpp
+++ b/rendering/openglrenderer.cpp
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"
 #include "simulation/simulationtime.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/DynObj.h"
 #include "model/AnimModel.h"
 #include "world/Traction.h"
diff --git a/rendering/precipitation.cpp b/rendering/precipitation.cpp
index 3f9ecaec..fdf13d7b 100644
--- a/rendering/precipitation.cpp
+++ b/rendering/precipitation.cpp
@@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Globals.h"
 #include "utilities/Timer.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 
 basic_precipitation::~basic_precipitation() {
     // TODO: release allocated resources
diff --git a/simulation/simulation.cpp b/simulation/simulation.cpp
index a1493f63..6ae89535 100644
--- a/simulation/simulation.cpp
+++ b/simulation/simulation.cpp
@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
 #include "rendering/lightarray.h"
 #include "rendering/particles.h"
 #include "scene/scene.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "application/application.h"
 #include "utilities/Logs.h"
 #include "vehicle/Driver.h"
diff --git a/simulation/simulation.h b/simulation/simulation.h
index 09ea4d42..4afd9422 100644
--- a/simulation/simulation.h
+++ b/simulation/simulation.h
@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulation/simulationstateserializer.h"
 #include "utilities/Classes.h"
 #include "world/Event.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "rendering/particles.h"
 
 #ifdef WITH_LUA
diff --git a/utilities/motiontelemetry.cpp b/utilities/motiontelemetry.cpp
index 473970d7..a449ea15 100644
--- a/utilities/motiontelemetry.cpp
+++ b/utilities/motiontelemetry.cpp
@@ -2,7 +2,7 @@
 #include "utilities/motiontelemetry.h"
 #include "utilities/Globals.h"
 #include "utilities/Logs.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "utilities/Timer.h"
 #include "vehicle/Driver.h"
 #include "simulation/simulation.h"
diff --git a/utilities/uart.cpp b/utilities/uart.cpp
index caa644aa..70b8d553 100644
--- a/utilities/uart.cpp
+++ b/utilities/uart.cpp
@@ -3,7 +3,7 @@
 
 #include "utilities/Globals.h"
 #include "simulation/simulation.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "utilities/parser.h"
 #include "utilities/Logs.h"
 #include "utilities/utilities.h"
diff --git a/vehicle/Driver.cpp b/vehicle/Driver.cpp
index 1552ead7..54f97bd8 100644
--- a/vehicle/Driver.cpp
+++ b/vehicle/Driver.cpp
@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
 #include "utilities/Globals.h"
 #include "utilities/translation.h"
 #include "utilities/Logs.h"
-#include "vehicle/Train.h"
+#include "train/Train.h"
 #include "world/mtable.h"
 #include "vehicle/DynObj.h"
 #include "world/Event.h"
diff --git a/vehicle/DynObj.cpp b/vehicle/DynObj.cpp
index 5fedf2d1..a02be2af 100644
--- a/vehicle/DynObj.cpp
+++ b/vehicle/DynObj.cpp
@@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include "simulation/simulation.h"
 #include "rendering/lightarray.h"
-#include "vehicle/Train.h"
+#include "train/Train.h"
 #include "vehicle/Driver.h"
 #include "utilities/Globals.h"
 #include "utilities/Timer.h"
diff --git a/vehicle/Train.cpp b/vehicle/train/Train.cpp
similarity index 100%
rename from vehicle/Train.cpp
rename to vehicle/train/Train.cpp
diff --git a/vehicle/Train.h b/vehicle/train/Train.h
similarity index 100%
rename from vehicle/Train.h
rename to vehicle/train/Train.h
diff --git a/vehicle/Train_Commands_Auxiliary.cpp b/vehicle/train/TrainCommandsAuxiliary.cpp
similarity index 100%
rename from vehicle/Train_Commands_Auxiliary.cpp
rename to vehicle/train/TrainCommandsAuxiliary.cpp
diff --git a/vehicle/Train_Commands_Brakes.cpp b/vehicle/train/TrainCommandsBrakes.cpp
similarity index 100%
rename from vehicle/Train_Commands_Brakes.cpp
rename to vehicle/train/TrainCommandsBrakes.cpp
diff --git a/vehicle/Train_Commands_Controls.cpp b/vehicle/train/TrainCommandsControls.cpp
similarity index 100%
rename from vehicle/Train_Commands_Controls.cpp
rename to vehicle/train/TrainCommandsControls.cpp
diff --git a/vehicle/Train_Commands_Doors.cpp b/vehicle/train/TrainCommandsDoors.cpp
similarity index 100%
rename from vehicle/Train_Commands_Doors.cpp
rename to vehicle/train/TrainCommandsDoors.cpp
diff --git a/vehicle/Train_Commands_Electrical.cpp b/vehicle/train/TrainCommandsElectrical.cpp
similarity index 100%
rename from vehicle/Train_Commands_Electrical.cpp
rename to vehicle/train/TrainCommandsElectrical.cpp
diff --git a/vehicle/Train_Commands_Lights.cpp b/vehicle/train/TrainCommandsLights.cpp
similarity index 100%
rename from vehicle/Train_Commands_Lights.cpp
rename to vehicle/train/TrainCommandsLights.cpp
diff --git a/vehicle/Train_Commands_Misc.cpp b/vehicle/train/TrainCommandsMisc.cpp
similarity index 100%
rename from vehicle/Train_Commands_Misc.cpp
rename to vehicle/train/TrainCommandsMisc.cpp
diff --git a/vehicle/Train_Commands_Radio.cpp b/vehicle/train/TrainCommandsRadio.cpp
similarity index 100%
rename from vehicle/Train_Commands_Radio.cpp
rename to vehicle/train/TrainCommandsRadio.cpp
diff --git a/widgets/map.cpp b/widgets/map.cpp
index 6b1ddee7..dd296946 100644
--- a/widgets/map.cpp
+++ b/widgets/map.cpp
@@ -2,7 +2,7 @@
 #include "widgets/map.h"
 #include "widgets/map_objects.h"
 #include "utilities/Logs.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 #include "vehicle/Camera.h"
 #include "simulation/simulation.h"
 #include "vehicle/Driver.h"
diff --git a/widgets/vehicleparams.cpp b/widgets/vehicleparams.cpp
index 51ad7a07..c49be266 100644
--- a/widgets/vehicleparams.cpp
+++ b/widgets/vehicleparams.cpp
@@ -3,7 +3,7 @@
 #include "simulation/simulation.h"
 #include "application/driveruipanels.h"
 #include "vehicle/Driver.h"
-#include "vehicle/Train.h"
+#include "../vehicle/train/Train.h"
 
 ui::vehicleparams_panel::vehicleparams_panel(const std::string &vehicle) : ui_panel(std::string(STR("Vehicle parameters")) + ": " + vehicle, false), m_vehicle_name(vehicle)
 {