From 9aa8cc238404eb19a88364e9a1bf2b6d5eb19b21 Mon Sep 17 00:00:00 2001
From: Arne Keller <arne.keller01@yahoo.de>
Date: Sun, 16 Feb 2020 15:01:33 +0100
Subject: [PATCH] Reorganize code

---
 src/edu/kit/informatik/{ => model}/Coach.java             | 4 +++-
 src/edu/kit/informatik/{ => model}/DieselEngine.java      | 2 +-
 src/edu/kit/informatik/{ => model}/ElectricalEngine.java  | 2 +-
 src/edu/kit/informatik/{ => model}/Engine.java            | 2 +-
 .../informatik/{ => model}/ModelRailwaySimulation.java    | 5 ++++-
 src/edu/kit/informatik/{ => model}/Rail.java              | 2 +-
 src/edu/kit/informatik/{ => model}/RollingStock.java      | 2 +-
 src/edu/kit/informatik/{ => model}/SteamEngine.java       | 2 +-
 src/edu/kit/informatik/{ => model}/Switch.java            | 2 +-
 src/edu/kit/informatik/{ => model}/Track.java             | 2 +-
 src/edu/kit/informatik/{ => model}/Train.java             | 4 +++-
 src/edu/kit/informatik/{ => model}/TrainSet.java          | 2 +-
 src/edu/kit/informatik/{ => model}/Vector2D.java          | 2 +-
 src/edu/kit/informatik/{ => ui}/CoachType.java            | 2 +-
 src/edu/kit/informatik/{ => ui}/CommandLine.java          | 8 +++++---
 src/edu/kit/informatik/{ => ui}/EngineType.java           | 2 +-
 .../kit/informatik/{ => ui}/InvalidInputException.java    | 2 +-
 src/edu/kit/informatik/{ => ui}/command/AddSwitch.java    | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/AddTrack.java     | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/AddTrain.java     | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/Command.java      | 4 ++--
 .../kit/informatik/{ => ui}/command/CommandFactory.java   | 6 +++++-
 src/edu/kit/informatik/{ => ui}/command/CreateCoach.java  | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/CreateEngine.java | 4 +++-
 .../kit/informatik/{ => ui}/command/CreateTrainSet.java   | 6 +++---
 .../informatik/{ => ui}/command/DeleteRollingStock.java   | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/DeleteTrack.java  | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/DeleteTrain.java  | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/ListCoaches.java  | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/ListEngines.java  | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/ListTracks.java   | 4 ++--
 .../kit/informatik/{ => ui}/command/ListTrainSets.java    | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/ListTrains.java   | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/PutTrain.java     | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/SetSwitch.java    | 6 +++---
 src/edu/kit/informatik/{ => ui}/command/ShowTrain.java    | 4 ++--
 src/edu/kit/informatik/{ => ui}/command/Step.java         | 4 ++--
 37 files changed, 79 insertions(+), 64 deletions(-)
 rename src/edu/kit/informatik/{ => model}/Coach.java (97%)
 rename src/edu/kit/informatik/{ => model}/DieselEngine.java (97%)
 rename src/edu/kit/informatik/{ => model}/ElectricalEngine.java (97%)
 rename src/edu/kit/informatik/{ => model}/Engine.java (96%)
 rename src/edu/kit/informatik/{ => model}/ModelRailwaySimulation.java (99%)
 rename src/edu/kit/informatik/{ => model}/Rail.java (98%)
 rename src/edu/kit/informatik/{ => model}/RollingStock.java (96%)
 rename src/edu/kit/informatik/{ => model}/SteamEngine.java (97%)
 rename src/edu/kit/informatik/{ => model}/Switch.java (99%)
 rename src/edu/kit/informatik/{ => model}/Track.java (98%)
 rename src/edu/kit/informatik/{ => model}/Train.java (98%)
 rename src/edu/kit/informatik/{ => model}/TrainSet.java (98%)
 rename src/edu/kit/informatik/{ => model}/Vector2D.java (99%)
 rename src/edu/kit/informatik/{ => ui}/CoachType.java (97%)
 rename src/edu/kit/informatik/{ => ui}/CommandLine.java (87%)
 rename src/edu/kit/informatik/{ => ui}/EngineType.java (96%)
 rename src/edu/kit/informatik/{ => ui}/InvalidInputException.java (91%)
 rename src/edu/kit/informatik/{ => ui}/command/AddSwitch.java (86%)
 rename src/edu/kit/informatik/{ => ui}/command/AddTrack.java (87%)
 rename src/edu/kit/informatik/{ => ui}/command/AddTrain.java (88%)
 rename src/edu/kit/informatik/{ => ui}/command/Command.java (72%)
 rename src/edu/kit/informatik/{ => ui}/command/CommandFactory.java (98%)
 rename src/edu/kit/informatik/{ => ui}/command/CreateCoach.java (89%)
 rename src/edu/kit/informatik/{ => ui}/command/CreateEngine.java (94%)
 rename src/edu/kit/informatik/{ => ui}/command/CreateTrainSet.java (91%)
 rename src/edu/kit/informatik/{ => ui}/command/DeleteRollingStock.java (87%)
 rename src/edu/kit/informatik/{ => ui}/command/DeleteTrack.java (87%)
 rename src/edu/kit/informatik/{ => ui}/command/DeleteTrain.java (87%)
 rename src/edu/kit/informatik/{ => ui}/command/ListCoaches.java (72%)
 rename src/edu/kit/informatik/{ => ui}/command/ListEngines.java (72%)
 rename src/edu/kit/informatik/{ => ui}/command/ListTracks.java (73%)
 rename src/edu/kit/informatik/{ => ui}/command/ListTrainSets.java (74%)
 rename src/edu/kit/informatik/{ => ui}/command/ListTrains.java (73%)
 rename src/edu/kit/informatik/{ => ui}/command/PutTrain.java (87%)
 rename src/edu/kit/informatik/{ => ui}/command/SetSwitch.java (84%)
 rename src/edu/kit/informatik/{ => ui}/command/ShowTrain.java (82%)
 rename src/edu/kit/informatik/{ => ui}/command/Step.java (83%)

diff --git a/src/edu/kit/informatik/Coach.java b/src/edu/kit/informatik/model/Coach.java
similarity index 97%
rename from src/edu/kit/informatik/Coach.java
rename to src/edu/kit/informatik/model/Coach.java
index 90f884e..ea67269 100644
--- a/src/edu/kit/informatik/Coach.java
+++ b/src/edu/kit/informatik/model/Coach.java
@@ -1,4 +1,6 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.ui.CoachType;
 
 /**
  * A coach.
diff --git a/src/edu/kit/informatik/DieselEngine.java b/src/edu/kit/informatik/model/DieselEngine.java
similarity index 97%
rename from src/edu/kit/informatik/DieselEngine.java
rename to src/edu/kit/informatik/model/DieselEngine.java
index 64b2eb9..ee4b452 100644
--- a/src/edu/kit/informatik/DieselEngine.java
+++ b/src/edu/kit/informatik/model/DieselEngine.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Diesel engine.
diff --git a/src/edu/kit/informatik/ElectricalEngine.java b/src/edu/kit/informatik/model/ElectricalEngine.java
similarity index 97%
rename from src/edu/kit/informatik/ElectricalEngine.java
rename to src/edu/kit/informatik/model/ElectricalEngine.java
index 5776a0e..d24585c 100644
--- a/src/edu/kit/informatik/ElectricalEngine.java
+++ b/src/edu/kit/informatik/model/ElectricalEngine.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Electrical engine.
diff --git a/src/edu/kit/informatik/Engine.java b/src/edu/kit/informatik/model/Engine.java
similarity index 96%
rename from src/edu/kit/informatik/Engine.java
rename to src/edu/kit/informatik/model/Engine.java
index abd3d01..af2f618 100644
--- a/src/edu/kit/informatik/Engine.java
+++ b/src/edu/kit/informatik/model/Engine.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Generic engine, is usually either diesel, steam or electric.
diff --git a/src/edu/kit/informatik/ModelRailwaySimulation.java b/src/edu/kit/informatik/model/ModelRailwaySimulation.java
similarity index 99%
rename from src/edu/kit/informatik/ModelRailwaySimulation.java
rename to src/edu/kit/informatik/model/ModelRailwaySimulation.java
index 0640fb5..ced6dd0 100644
--- a/src/edu/kit/informatik/ModelRailwaySimulation.java
+++ b/src/edu/kit/informatik/model/ModelRailwaySimulation.java
@@ -1,4 +1,7 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.ui.CoachType;
+import edu.kit.informatik.Terminal;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/edu/kit/informatik/Rail.java b/src/edu/kit/informatik/model/Rail.java
similarity index 98%
rename from src/edu/kit/informatik/Rail.java
rename to src/edu/kit/informatik/model/Rail.java
index 0e9ffd3..2a31bb0 100644
--- a/src/edu/kit/informatik/Rail.java
+++ b/src/edu/kit/informatik/model/Rail.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Generic rail that other rails can connect to.
diff --git a/src/edu/kit/informatik/RollingStock.java b/src/edu/kit/informatik/model/RollingStock.java
similarity index 96%
rename from src/edu/kit/informatik/RollingStock.java
rename to src/edu/kit/informatik/model/RollingStock.java
index 101a8e7..38a0a4b 100644
--- a/src/edu/kit/informatik/RollingStock.java
+++ b/src/edu/kit/informatik/model/RollingStock.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * A rolling stock. Is usually an engine, train set or coach.
diff --git a/src/edu/kit/informatik/SteamEngine.java b/src/edu/kit/informatik/model/SteamEngine.java
similarity index 97%
rename from src/edu/kit/informatik/SteamEngine.java
rename to src/edu/kit/informatik/model/SteamEngine.java
index 4b11fea..6c2c910 100644
--- a/src/edu/kit/informatik/SteamEngine.java
+++ b/src/edu/kit/informatik/model/SteamEngine.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Steam engine.
diff --git a/src/edu/kit/informatik/Switch.java b/src/edu/kit/informatik/model/Switch.java
similarity index 99%
rename from src/edu/kit/informatik/Switch.java
rename to src/edu/kit/informatik/model/Switch.java
index 732e599..df2fa29 100644
--- a/src/edu/kit/informatik/Switch.java
+++ b/src/edu/kit/informatik/model/Switch.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 
diff --git a/src/edu/kit/informatik/Track.java b/src/edu/kit/informatik/model/Track.java
similarity index 98%
rename from src/edu/kit/informatik/Track.java
rename to src/edu/kit/informatik/model/Track.java
index 957cef9..33d71f6 100644
--- a/src/edu/kit/informatik/Track.java
+++ b/src/edu/kit/informatik/model/Track.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 
diff --git a/src/edu/kit/informatik/Train.java b/src/edu/kit/informatik/model/Train.java
similarity index 98%
rename from src/edu/kit/informatik/Train.java
rename to src/edu/kit/informatik/model/Train.java
index 15af9eb..0eed916 100644
--- a/src/edu/kit/informatik/Train.java
+++ b/src/edu/kit/informatik/model/Train.java
@@ -1,4 +1,6 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
+
+import edu.kit.informatik.Terminal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/edu/kit/informatik/TrainSet.java b/src/edu/kit/informatik/model/TrainSet.java
similarity index 98%
rename from src/edu/kit/informatik/TrainSet.java
rename to src/edu/kit/informatik/model/TrainSet.java
index 4c571ad..d880e2f 100644
--- a/src/edu/kit/informatik/TrainSet.java
+++ b/src/edu/kit/informatik/model/TrainSet.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 /**
  * Train set.
diff --git a/src/edu/kit/informatik/Vector2D.java b/src/edu/kit/informatik/model/Vector2D.java
similarity index 99%
rename from src/edu/kit/informatik/Vector2D.java
rename to src/edu/kit/informatik/model/Vector2D.java
index c56c46d..31591ed 100644
--- a/src/edu/kit/informatik/Vector2D.java
+++ b/src/edu/kit/informatik/model/Vector2D.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.model;
 
 import java.util.Objects;
 
diff --git a/src/edu/kit/informatik/CoachType.java b/src/edu/kit/informatik/ui/CoachType.java
similarity index 97%
rename from src/edu/kit/informatik/CoachType.java
rename to src/edu/kit/informatik/ui/CoachType.java
index e084348..513372b 100644
--- a/src/edu/kit/informatik/CoachType.java
+++ b/src/edu/kit/informatik/ui/CoachType.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Type of a coach.
diff --git a/src/edu/kit/informatik/CommandLine.java b/src/edu/kit/informatik/ui/CommandLine.java
similarity index 87%
rename from src/edu/kit/informatik/CommandLine.java
rename to src/edu/kit/informatik/ui/CommandLine.java
index c692aa1..d4e8b54 100644
--- a/src/edu/kit/informatik/CommandLine.java
+++ b/src/edu/kit/informatik/ui/CommandLine.java
@@ -1,7 +1,9 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
-import edu.kit.informatik.command.Command;
-import edu.kit.informatik.command.CommandFactory;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.Terminal;
+import edu.kit.informatik.ui.command.Command;
+import edu.kit.informatik.ui.command.CommandFactory;
 
 /**
  * Interactive simulation runner, gets user inputs and processes commands specified.
diff --git a/src/edu/kit/informatik/EngineType.java b/src/edu/kit/informatik/ui/EngineType.java
similarity index 96%
rename from src/edu/kit/informatik/EngineType.java
rename to src/edu/kit/informatik/ui/EngineType.java
index 8e9ddfe..2bdc623 100644
--- a/src/edu/kit/informatik/EngineType.java
+++ b/src/edu/kit/informatik/ui/EngineType.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Type of locomotive. Can be either diesel, steam or electrical.
diff --git a/src/edu/kit/informatik/InvalidInputException.java b/src/edu/kit/informatik/ui/InvalidInputException.java
similarity index 91%
rename from src/edu/kit/informatik/InvalidInputException.java
rename to src/edu/kit/informatik/ui/InvalidInputException.java
index 3a015e0..057ac85 100644
--- a/src/edu/kit/informatik/InvalidInputException.java
+++ b/src/edu/kit/informatik/ui/InvalidInputException.java
@@ -1,4 +1,4 @@
-package edu.kit.informatik;
+package edu.kit.informatik.ui;
 
 /**
  * Thrown on invalid user input.
diff --git a/src/edu/kit/informatik/command/AddSwitch.java b/src/edu/kit/informatik/ui/command/AddSwitch.java
similarity index 86%
rename from src/edu/kit/informatik/command/AddSwitch.java
rename to src/edu/kit/informatik/ui/command/AddSwitch.java
index 1356fa3..e9c3c77 100644
--- a/src/edu/kit/informatik/command/AddSwitch.java
+++ b/src/edu/kit/informatik/ui/command/AddSwitch.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/AddTrack.java b/src/edu/kit/informatik/ui/command/AddTrack.java
similarity index 87%
rename from src/edu/kit/informatik/command/AddTrack.java
rename to src/edu/kit/informatik/ui/command/AddTrack.java
index b2370d9..b52b56a 100644
--- a/src/edu/kit/informatik/command/AddTrack.java
+++ b/src/edu/kit/informatik/ui/command/AddTrack.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/AddTrain.java b/src/edu/kit/informatik/ui/command/AddTrain.java
similarity index 88%
rename from src/edu/kit/informatik/command/AddTrain.java
rename to src/edu/kit/informatik/ui/command/AddTrain.java
index 42afc20..8e2ce1d 100644
--- a/src/edu/kit/informatik/command/AddTrain.java
+++ b/src/edu/kit/informatik/ui/command/AddTrain.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
-import edu.kit.informatik.RollingStock;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.model.RollingStock;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/Command.java b/src/edu/kit/informatik/ui/command/Command.java
similarity index 72%
rename from src/edu/kit/informatik/command/Command.java
rename to src/edu/kit/informatik/ui/command/Command.java
index 9006d11..a4ab241 100644
--- a/src/edu/kit/informatik/command/Command.java
+++ b/src/edu/kit/informatik/ui/command/Command.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command that can be applied to a simulation.
diff --git a/src/edu/kit/informatik/command/CommandFactory.java b/src/edu/kit/informatik/ui/command/CommandFactory.java
similarity index 98%
rename from src/edu/kit/informatik/command/CommandFactory.java
rename to src/edu/kit/informatik/ui/command/CommandFactory.java
index d8b5e90..a2a471f 100644
--- a/src/edu/kit/informatik/command/CommandFactory.java
+++ b/src/edu/kit/informatik/ui/command/CommandFactory.java
@@ -1,6 +1,10 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
 import edu.kit.informatik.*;
+import edu.kit.informatik.model.Vector2D;
+import edu.kit.informatik.ui.CoachType;
+import edu.kit.informatik.ui.EngineType;
+import edu.kit.informatik.ui.InvalidInputException;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/edu/kit/informatik/command/CreateCoach.java b/src/edu/kit/informatik/ui/command/CreateCoach.java
similarity index 89%
rename from src/edu/kit/informatik/command/CreateCoach.java
rename to src/edu/kit/informatik/ui/command/CreateCoach.java
index 4e29994..3e57bf4 100644
--- a/src/edu/kit/informatik/command/CreateCoach.java
+++ b/src/edu/kit/informatik/ui/command/CreateCoach.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.CoachType;
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.ui.CoachType;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/CreateEngine.java b/src/edu/kit/informatik/ui/command/CreateEngine.java
similarity index 94%
rename from src/edu/kit/informatik/command/CreateEngine.java
rename to src/edu/kit/informatik/ui/command/CreateEngine.java
index 7107b3f..43c070e 100644
--- a/src/edu/kit/informatik/command/CreateEngine.java
+++ b/src/edu/kit/informatik/ui/command/CreateEngine.java
@@ -1,6 +1,8 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
 import edu.kit.informatik.*;
+import edu.kit.informatik.model.*;
+import edu.kit.informatik.ui.EngineType;
 
 /**
  * Command used to create a single engine.
diff --git a/src/edu/kit/informatik/command/CreateTrainSet.java b/src/edu/kit/informatik/ui/command/CreateTrainSet.java
similarity index 91%
rename from src/edu/kit/informatik/command/CreateTrainSet.java
rename to src/edu/kit/informatik/ui/command/CreateTrainSet.java
index e91aa62..e5e32b1 100644
--- a/src/edu/kit/informatik/command/CreateTrainSet.java
+++ b/src/edu/kit/informatik/ui/command/CreateTrainSet.java
@@ -1,8 +1,8 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
-import edu.kit.informatik.TrainSet;
+import edu.kit.informatik.model.TrainSet;
 
 /**
  * Command used to add a new train set.
diff --git a/src/edu/kit/informatik/command/DeleteRollingStock.java b/src/edu/kit/informatik/ui/command/DeleteRollingStock.java
similarity index 87%
rename from src/edu/kit/informatik/command/DeleteRollingStock.java
rename to src/edu/kit/informatik/ui/command/DeleteRollingStock.java
index 9253200..a39fe75 100644
--- a/src/edu/kit/informatik/command/DeleteRollingStock.java
+++ b/src/edu/kit/informatik/ui/command/DeleteRollingStock.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/DeleteTrack.java b/src/edu/kit/informatik/ui/command/DeleteTrack.java
similarity index 87%
rename from src/edu/kit/informatik/command/DeleteTrack.java
rename to src/edu/kit/informatik/ui/command/DeleteTrack.java
index bdff79e..d2a401f 100644
--- a/src/edu/kit/informatik/command/DeleteTrack.java
+++ b/src/edu/kit/informatik/ui/command/DeleteTrack.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/DeleteTrain.java b/src/edu/kit/informatik/ui/command/DeleteTrain.java
similarity index 87%
rename from src/edu/kit/informatik/command/DeleteTrain.java
rename to src/edu/kit/informatik/ui/command/DeleteTrain.java
index 10d0b95..ea50597 100644
--- a/src/edu/kit/informatik/command/DeleteTrain.java
+++ b/src/edu/kit/informatik/ui/command/DeleteTrain.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/ListCoaches.java b/src/edu/kit/informatik/ui/command/ListCoaches.java
similarity index 72%
rename from src/edu/kit/informatik/command/ListCoaches.java
rename to src/edu/kit/informatik/ui/command/ListCoaches.java
index e535be0..357c44d 100644
--- a/src/edu/kit/informatik/command/ListCoaches.java
+++ b/src/edu/kit/informatik/ui/command/ListCoaches.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of coaches.
diff --git a/src/edu/kit/informatik/command/ListEngines.java b/src/edu/kit/informatik/ui/command/ListEngines.java
similarity index 72%
rename from src/edu/kit/informatik/command/ListEngines.java
rename to src/edu/kit/informatik/ui/command/ListEngines.java
index 5ce78b6..04283f5 100644
--- a/src/edu/kit/informatik/command/ListEngines.java
+++ b/src/edu/kit/informatik/ui/command/ListEngines.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of engines.
diff --git a/src/edu/kit/informatik/command/ListTracks.java b/src/edu/kit/informatik/ui/command/ListTracks.java
similarity index 73%
rename from src/edu/kit/informatik/command/ListTracks.java
rename to src/edu/kit/informatik/ui/command/ListTracks.java
index 9a062e7..fa491bd 100644
--- a/src/edu/kit/informatik/command/ListTracks.java
+++ b/src/edu/kit/informatik/ui/command/ListTracks.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of tracks and switches.
diff --git a/src/edu/kit/informatik/command/ListTrainSets.java b/src/edu/kit/informatik/ui/command/ListTrainSets.java
similarity index 74%
rename from src/edu/kit/informatik/command/ListTrainSets.java
rename to src/edu/kit/informatik/ui/command/ListTrainSets.java
index f82843a..582f5d9 100644
--- a/src/edu/kit/informatik/command/ListTrainSets.java
+++ b/src/edu/kit/informatik/ui/command/ListTrainSets.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of train sets on the terminal.
diff --git a/src/edu/kit/informatik/command/ListTrains.java b/src/edu/kit/informatik/ui/command/ListTrains.java
similarity index 73%
rename from src/edu/kit/informatik/command/ListTrains.java
rename to src/edu/kit/informatik/ui/command/ListTrains.java
index e03cc5e..19273e5 100644
--- a/src/edu/kit/informatik/command/ListTrains.java
+++ b/src/edu/kit/informatik/ui/command/ListTrains.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a list of trains on the terminal.
diff --git a/src/edu/kit/informatik/command/PutTrain.java b/src/edu/kit/informatik/ui/command/PutTrain.java
similarity index 87%
rename from src/edu/kit/informatik/command/PutTrain.java
rename to src/edu/kit/informatik/ui/command/PutTrain.java
index 8f30e43..8604744 100644
--- a/src/edu/kit/informatik/command/PutTrain.java
+++ b/src/edu/kit/informatik/ui/command/PutTrain.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/SetSwitch.java b/src/edu/kit/informatik/ui/command/SetSwitch.java
similarity index 84%
rename from src/edu/kit/informatik/command/SetSwitch.java
rename to src/edu/kit/informatik/ui/command/SetSwitch.java
index c6c79b1..fb6b719 100644
--- a/src/edu/kit/informatik/command/SetSwitch.java
+++ b/src/edu/kit/informatik/ui/command/SetSwitch.java
@@ -1,7 +1,7 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
-import edu.kit.informatik.Vector2D;
+import edu.kit.informatik.model.ModelRailwaySimulation;
+import edu.kit.informatik.model.Vector2D;
 import edu.kit.informatik.Terminal;
 
 /**
diff --git a/src/edu/kit/informatik/command/ShowTrain.java b/src/edu/kit/informatik/ui/command/ShowTrain.java
similarity index 82%
rename from src/edu/kit/informatik/command/ShowTrain.java
rename to src/edu/kit/informatik/ui/command/ShowTrain.java
index 705ccc3..5a0586e 100644
--- a/src/edu/kit/informatik/command/ShowTrain.java
+++ b/src/edu/kit/informatik/ui/command/ShowTrain.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to print a train as ASCII art.
diff --git a/src/edu/kit/informatik/command/Step.java b/src/edu/kit/informatik/ui/command/Step.java
similarity index 83%
rename from src/edu/kit/informatik/command/Step.java
rename to src/edu/kit/informatik/ui/command/Step.java
index c8ce6a9..23a6a79 100644
--- a/src/edu/kit/informatik/command/Step.java
+++ b/src/edu/kit/informatik/ui/command/Step.java
@@ -1,6 +1,6 @@
-package edu.kit.informatik.command;
+package edu.kit.informatik.ui.command;
 
-import edu.kit.informatik.ModelRailwaySimulation;
+import edu.kit.informatik.model.ModelRailwaySimulation;
 
 /**
  * Command used to advance the simulation.