diff --git a/server/src/board/tile/rail/signal2aspectrailtile.cpp b/server/src/board/tile/rail/signal/signal2aspectrailtile.cpp
similarity index 90%
rename from server/src/board/tile/rail/signal2aspectrailtile.cpp
rename to server/src/board/tile/rail/signal/signal2aspectrailtile.cpp
index af418a8d..884eec24 100644
--- a/server/src/board/tile/rail/signal2aspectrailtile.cpp
+++ b/server/src/board/tile/rail/signal/signal2aspectrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signal2aspectrailtile.cpp
+ * server/src/board/tile/rail/signal/signal2aspectrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "signal2aspectrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 Signal2AspectRailTile::Signal2AspectRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   SignalRailTile(world, _id, TileId::RailSignal2Aspect)
diff --git a/server/src/board/tile/rail/signal2aspectrailtile.hpp b/server/src/board/tile/rail/signal/signal2aspectrailtile.hpp
similarity index 84%
rename from server/src/board/tile/rail/signal2aspectrailtile.hpp
rename to server/src/board/tile/rail/signal/signal2aspectrailtile.hpp
index b60ed8d6..fb0eff29 100644
--- a/server/src/board/tile/rail/signal2aspectrailtile.hpp
+++ b/server/src/board/tile/rail/signal/signal2aspectrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signal2aspectrailtile.hpp
+ * server/src/board/tile/rail/signal/signal2aspectrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL2ASPECTRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL2ASPECTRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNAL2ASPECTRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNAL2ASPECTRAILTILE_HPP
 
 #include "signalrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/signal3aspectrailtile.cpp b/server/src/board/tile/rail/signal/signal3aspectrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/signal3aspectrailtile.cpp
rename to server/src/board/tile/rail/signal/signal3aspectrailtile.cpp
index 9c052d1c..ad84ff82 100644
--- a/server/src/board/tile/rail/signal3aspectrailtile.cpp
+++ b/server/src/board/tile/rail/signal/signal3aspectrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signal3aspectrailtile.cpp
+ * server/src/board/tile/rail/signal/signal3aspectrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "signal3aspectrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 Signal3AspectRailTile::Signal3AspectRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   SignalRailTile(world, _id, TileId::RailSignal3Aspect)
diff --git a/server/src/board/tile/rail/signal3aspectrailtile.hpp b/server/src/board/tile/rail/signal/signal3aspectrailtile.hpp
similarity index 84%
rename from server/src/board/tile/rail/signal3aspectrailtile.hpp
rename to server/src/board/tile/rail/signal/signal3aspectrailtile.hpp
index cd28042a..0d3176ba 100644
--- a/server/src/board/tile/rail/signal3aspectrailtile.hpp
+++ b/server/src/board/tile/rail/signal/signal3aspectrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signal3aspectrailtile.hpp
+ * server/src/board/tile/rail/signal/signal3aspectrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL3ASPECTRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL3ASPECTRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNAL3ASPECTRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNAL3ASPECTRAILTILE_HPP
 
 #include "signalrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/signalrailtile.cpp b/server/src/board/tile/rail/signal/signalrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/signalrailtile.cpp
rename to server/src/board/tile/rail/signal/signalrailtile.cpp
index e2556633..ac32bd4d 100644
--- a/server/src/board/tile/rail/signalrailtile.cpp
+++ b/server/src/board/tile/rail/signal/signalrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signalrailtile.cpp
+ * server/src/board/tile/rail/signal/signalrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "signalrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../world/getworld.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../world/getworld.hpp"
 
 SignalRailTile::SignalRailTile(const std::weak_ptr<World>& world, std::string_view _id, TileId tileId) :
   StraightRailTile(world, _id, tileId),
diff --git a/server/src/board/tile/rail/signalrailtile.hpp b/server/src/board/tile/rail/signal/signalrailtile.hpp
similarity index 75%
rename from server/src/board/tile/rail/signalrailtile.hpp
rename to server/src/board/tile/rail/signal/signalrailtile.hpp
index 86157604..8e7cf9f4 100644
--- a/server/src/board/tile/rail/signalrailtile.hpp
+++ b/server/src/board/tile/rail/signal/signalrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/signalrailtile.hpp
+ * server/src/board/tile/rail/signal/signalrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNALRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNALRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNALRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_SIGNAL_SIGNALRAILTILE_HPP
 
-#include "straightrailtile.hpp"
-#include "../../../core/method.hpp"
-#include "../../../enum/signalaspect.hpp"
-#include "../../../core/objectproperty.hpp"
-#include "../../../hardware/output/map/signaloutputmap.hpp"
+#include "../straightrailtile.hpp"
+#include "../../../../core/method.hpp"
+#include "../../../../enum/signalaspect.hpp"
+#include "../../../../core/objectproperty.hpp"
+#include "../../../../hardware/output/map/signaloutputmap.hpp"
 
 class SignalRailTile : public StraightRailTile
 {
diff --git a/server/src/board/tile/rail/turnout3wayrailtile.cpp b/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/turnout3wayrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp
index 1d9d8d25..3d9f9b05 100644
--- a/server/src/board/tile/rail/turnout3wayrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnout3wayrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnout3wayrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnout3wayrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 Turnout3WayRailTile::Turnout3WayRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   TurnoutRailTile(world, _id, TileId::RailTurnout3Way)
diff --git a/server/src/board/tile/rail/turnout3wayrailtile.hpp b/server/src/board/tile/rail/turnout/turnout3wayrailtile.hpp
similarity index 84%
rename from server/src/board/tile/rail/turnout3wayrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnout3wayrailtile.hpp
index 4a788307..8659011a 100644
--- a/server/src/board/tile/rail/turnout3wayrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnout3wayrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnout3wayrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnout3wayrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT3WAYRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT3WAYRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUT3WAYRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUT3WAYRAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutdoublesliprailtile.cpp b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp
similarity index 91%
rename from server/src/board/tile/rail/turnoutdoublesliprailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp
index b4d8d753..5a6ac2ae 100644
--- a/server/src/board/tile/rail/turnoutdoublesliprailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutdoublesliprailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutdoublesliprailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 TurnoutDoubleSlipRailTile::TurnoutDoubleSlipRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   TurnoutRailTile(world, _id, TileId::RailTurnoutDoubleSlip)
diff --git a/server/src/board/tile/rail/turnoutdoublesliprailtile.hpp b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutdoublesliprailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.hpp
index 444c1d19..f1e91711 100644
--- a/server/src/board/tile/rail/turnoutdoublesliprailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutdoublesliprailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutdoublesliprailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTDOUBLESLIPRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTDOUBLESLIPRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTDOUBLESLIPRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTDOUBLESLIPRAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutleft45railtile.cpp b/server/src/board/tile/rail/turnout/turnoutleft45railtile.cpp
similarity index 94%
rename from server/src/board/tile/rail/turnoutleft45railtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutleft45railtile.cpp
index 604831b2..21cdf166 100644
--- a/server/src/board/tile/rail/turnoutleft45railtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutleft45railtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleft45railtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutleft45railtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutleft45railtile.hpp b/server/src/board/tile/rail/turnout/turnoutleft45railtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutleft45railtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutleft45railtile.hpp
index d780e986..1c2f55cc 100644
--- a/server/src/board/tile/rail/turnoutleft45railtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutleft45railtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleft45railtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutleft45railtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFT45RAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFT45RAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFT45RAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFT45RAILTILE_HPP
 
 #include "turnoutleftrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutleft90railtile.cpp b/server/src/board/tile/rail/turnout/turnoutleft90railtile.cpp
similarity index 94%
rename from server/src/board/tile/rail/turnoutleft90railtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutleft90railtile.cpp
index 940707ff..1b82843f 100644
--- a/server/src/board/tile/rail/turnoutleft90railtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutleft90railtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleft90railtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutleft90railtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutleft90railtile.hpp b/server/src/board/tile/rail/turnout/turnoutleft90railtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutleft90railtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutleft90railtile.hpp
index 9d5db07a..4807714a 100644
--- a/server/src/board/tile/rail/turnoutleft90railtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutleft90railtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleft90railtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutleft90railtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFT90RAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFT90RAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFT90RAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFT90RAILTILE_HPP
 
 #include "turnoutleftrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutleftcurvedrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/turnoutleftcurvedrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.cpp
index 06774485..f7a32ae2 100644
--- a/server/src/board/tile/rail/turnoutleftcurvedrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleftcurvedrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutleftcurvedrailtile.hpp b/server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutleftcurvedrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.hpp
index 86d4f740..bea27fb2 100644
--- a/server/src/board/tile/rail/turnoutleftcurvedrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleftcurvedrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutleftcurvedrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFTCURVEDRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFTCURVEDRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFTCURVEDRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFTCURVEDRAILTILE_HPP
 
 #include "turnoutleftrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutleftrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp
similarity index 91%
rename from server/src/board/tile/rail/turnoutleftrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp
index 14a74d20..0acdb290 100644
--- a/server/src/board/tile/rail/turnoutleftrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleftrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutleftrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutleftrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 TurnoutLeftRailTile::TurnoutLeftRailTile(const std::weak_ptr<World>& world, std::string_view _id, TileId tileId) :
   TurnoutRailTile(world, _id, tileId)
diff --git a/server/src/board/tile/rail/turnoutleftrailtile.hpp b/server/src/board/tile/rail/turnout/turnoutleftrailtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutleftrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutleftrailtile.hpp
index 76598493..ed2a303b 100644
--- a/server/src/board/tile/rail/turnoutleftrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutleftrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutleftrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutleftrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFTRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTLEFTRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFTRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTLEFTRAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/turnoutrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutrailtile.cpp
index d0cf7618..08eaef78 100644
--- a/server/src/board/tile/rail/turnoutrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../world/world.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../world/world.hpp"
 
 TurnoutRailTile::TurnoutRailTile(const std::weak_ptr<World>& world, std::string_view _id, TileId tileId) :
   RailTile(world, _id, tileId),
diff --git a/server/src/board/tile/rail/turnoutrailtile.hpp b/server/src/board/tile/rail/turnout/turnoutrailtile.hpp
similarity index 75%
rename from server/src/board/tile/rail/turnoutrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutrailtile.hpp
index 0ac11741..2594f7e5 100644
--- a/server/src/board/tile/rail/turnoutrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRAILTILE_HPP
 
-#include "railtile.hpp"
-#include "../../../core/objectproperty.hpp"
-#include "../../../core/method.hpp"
-#include "../../../enum/turnoutposition.hpp"
-#include "../../../hardware/output/map/turnoutoutputmap.hpp"
+#include "../railtile.hpp"
+#include "../../../../core/objectproperty.hpp"
+#include "../../../../core/method.hpp"
+#include "../../../../enum/turnoutposition.hpp"
+#include "../../../../hardware/output/map/turnoutoutputmap.hpp"
 
 class TurnoutRailTile : public RailTile
 {
diff --git a/server/src/board/tile/rail/turnoutright45railtile.cpp b/server/src/board/tile/rail/turnout/turnoutright45railtile.cpp
similarity index 94%
rename from server/src/board/tile/rail/turnoutright45railtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutright45railtile.cpp
index 2916aaf8..531ce8a7 100644
--- a/server/src/board/tile/rail/turnoutright45railtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutright45railtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutright45railtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutright45railtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutright45railtile.hpp b/server/src/board/tile/rail/turnout/turnoutright45railtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutright45railtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutright45railtile.hpp
index 482df90d..ad270d16 100644
--- a/server/src/board/tile/rail/turnoutright45railtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutright45railtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutright45railtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutright45railtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHT45RAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHT45RAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHT45RAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHT45RAILTILE_HPP
 
 #include "turnoutrightrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutright90railtile.cpp b/server/src/board/tile/rail/turnout/turnoutright90railtile.cpp
similarity index 94%
rename from server/src/board/tile/rail/turnoutright90railtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutright90railtile.cpp
index 9bc6c780..4c86c8ae 100644
--- a/server/src/board/tile/rail/turnoutright90railtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutright90railtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutright90railtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutright90railtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutright90railtile.hpp b/server/src/board/tile/rail/turnout/turnoutright90railtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutright90railtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutright90railtile.hpp
index ef82039a..8549557c 100644
--- a/server/src/board/tile/rail/turnoutright90railtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutright90railtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutright90railtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutright90railtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHT90RAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHT90RAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHT90RAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHT90RAILTILE_HPP
 
 #include "turnoutrightrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutrightcurvedrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.cpp
similarity index 93%
rename from server/src/board/tile/rail/turnoutrightcurvedrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.cpp
index a7fbd72e..44f9cc8b 100644
--- a/server/src/board/tile/rail/turnoutrightcurvedrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrightcurvedrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
diff --git a/server/src/board/tile/rail/turnoutrightcurvedrailtile.hpp b/server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.hpp
similarity index 82%
rename from server/src/board/tile/rail/turnoutrightcurvedrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.hpp
index 60406fe6..f26a4376 100644
--- a/server/src/board/tile/rail/turnoutrightcurvedrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrightcurvedrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutrightcurvedrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHTCURVEDRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHTCURVEDRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHTCURVEDRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHTCURVEDRAILTILE_HPP
 
 #include "turnoutrightrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutrightrailtile.cpp b/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp
similarity index 91%
rename from server/src/board/tile/rail/turnoutrightrailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp
index 391e5f62..924797a7 100644
--- a/server/src/board/tile/rail/turnoutrightrailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrightrailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutrightrailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutrightrailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 TurnoutRightRailTile::TurnoutRightRailTile(const std::weak_ptr<World>& world, std::string_view _id, TileId tileId) :
   TurnoutRailTile(world, _id, tileId)
diff --git a/server/src/board/tile/rail/turnoutrightrailtile.hpp b/server/src/board/tile/rail/turnout/turnoutrightrailtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutrightrailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutrightrailtile.hpp
index 08b387de..21ca8cbd 100644
--- a/server/src/board/tile/rail/turnoutrightrailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutrightrailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutrightrailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutrightrailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHTRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTRIGHTRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHTRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTRIGHTRAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutsinglesliprailtile.cpp b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp
similarity index 91%
rename from server/src/board/tile/rail/turnoutsinglesliprailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp
index 359e14ab..672a736d 100644
--- a/server/src/board/tile/rail/turnoutsinglesliprailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutsinglesliprailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutsinglesliprailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 TurnoutSingleSlipRailTile::TurnoutSingleSlipRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   TurnoutRailTile(world, _id, TileId::RailTurnoutSingleSlip)
diff --git a/server/src/board/tile/rail/turnoutsinglesliprailtile.hpp b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.hpp
similarity index 83%
rename from server/src/board/tile/rail/turnoutsinglesliprailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.hpp
index 6b116876..7d737005 100644
--- a/server/src/board/tile/rail/turnoutsinglesliprailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutsinglesliprailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutsinglesliprailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTSINGLESLIPRAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTSINGLESLIPRAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTSINGLESLIPRAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTSINGLESLIPRAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/rail/turnoutwyerailtile.cpp b/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp
similarity index 91%
rename from server/src/board/tile/rail/turnoutwyerailtile.cpp
rename to server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp
index af7c90cd..f887294c 100644
--- a/server/src/board/tile/rail/turnoutwyerailtile.cpp
+++ b/server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutwyerailtile.cpp
+ * server/src/board/tile/rail/turnout/turnoutwyerailtile.cpp
  *
  * This file is part of the traintastic source code.
  *
@@ -21,8 +21,8 @@
  */
 
 #include "turnoutwyerailtile.hpp"
-#include "../../../core/attributes.hpp"
-#include "../../../utils/makearray.hpp"
+#include "../../../../core/attributes.hpp"
+#include "../../../../utils/makearray.hpp"
 
 TurnoutWyeRailTile::TurnoutWyeRailTile(const std::weak_ptr<World>& world, std::string_view _id) :
   TurnoutRailTile(world, _id, TileId::RailTurnoutWye)
diff --git a/server/src/board/tile/rail/turnoutwyerailtile.hpp b/server/src/board/tile/rail/turnout/turnoutwyerailtile.hpp
similarity index 84%
rename from server/src/board/tile/rail/turnoutwyerailtile.hpp
rename to server/src/board/tile/rail/turnout/turnoutwyerailtile.hpp
index a63471fd..fe8ee3f2 100644
--- a/server/src/board/tile/rail/turnoutwyerailtile.hpp
+++ b/server/src/board/tile/rail/turnout/turnoutwyerailtile.hpp
@@ -1,5 +1,5 @@
 /**
- * server/src/board/tile/rail/turnoutwyerailtile.hpp
+ * server/src/board/tile/rail/turnout/turnoutwyerailtile.hpp
  *
  * This file is part of the traintastic source code.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTWYERAILTILE_HPP
-#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUTWYERAILTILE_HPP
+#ifndef TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTWYERAILTILE_HPP
+#define TRAINTASTIC_SERVER_BOARD_TILE_RAIL_TURNOUT_TURNOUTWYERAILTILE_HPP
 
 #include "turnoutrailtile.hpp"
 
diff --git a/server/src/board/tile/tiles.hpp b/server/src/board/tile/tiles.hpp
index 7ffdefba..60db3126 100644
--- a/server/src/board/tile/tiles.hpp
+++ b/server/src/board/tile/tiles.hpp
@@ -30,18 +30,18 @@
 #include "rail/curve90railtile.hpp"
 #include "rail/cross45railtile.hpp"
 #include "rail/cross90railtile.hpp"
-#include "rail/turnoutleft45railtile.hpp"
-#include "rail/turnoutleft90railtile.hpp"
-#include "rail/turnoutleftcurvedrailtile.hpp"
-#include "rail/turnoutright45railtile.hpp"
-#include "rail/turnoutright90railtile.hpp"
-#include "rail/turnoutrightcurvedrailtile.hpp"
-#include "rail/turnoutwyerailtile.hpp"
-#include "rail/turnout3wayrailtile.hpp"
-#include "rail/turnoutsinglesliprailtile.hpp"
-#include "rail/turnoutdoublesliprailtile.hpp"
-#include "rail/signal2aspectrailtile.hpp"
-#include "rail/signal3aspectrailtile.hpp"
+#include "rail/turnout/turnoutleft45railtile.hpp"
+#include "rail/turnout/turnoutleft90railtile.hpp"
+#include "rail/turnout/turnoutleftcurvedrailtile.hpp"
+#include "rail/turnout/turnoutright45railtile.hpp"
+#include "rail/turnout/turnoutright90railtile.hpp"
+#include "rail/turnout/turnoutrightcurvedrailtile.hpp"
+#include "rail/turnout/turnoutwyerailtile.hpp"
+#include "rail/turnout/turnout3wayrailtile.hpp"
+#include "rail/turnout/turnoutsinglesliprailtile.hpp"
+#include "rail/turnout/turnoutdoublesliprailtile.hpp"
+#include "rail/signal/signal2aspectrailtile.hpp"
+#include "rail/signal/signal3aspectrailtile.hpp"
 #include "rail/bufferstoprailtile.hpp"
 #include "rail/sensorrailtile.hpp"
 #include "rail/blockrailtile.hpp"