diff --git a/RoadTrain/FormTrainCollection.cs b/RoadTrain/FormTrainCollection.cs
index 5f6551f..f933bc3 100644
--- a/RoadTrain/FormTrainCollection.cs
+++ b/RoadTrain/FormTrainCollection.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using RoadTrain.DrawningObjects;
 using RoadTrain.Generics;
-using RoadTrain;
+using RoadTrain.Exceptions;
 using RoadTrain.MovementStrategy;
 using System;
 using System.Collections.Generic;
diff --git a/RoadTrain/RoadTrainGenericStorage.cs b/RoadTrain/RoadTrainGenericStorage.cs
index 183757b..628b4ed 100644
--- a/RoadTrain/RoadTrainGenericStorage.cs
+++ b/RoadTrain/RoadTrainGenericStorage.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using RoadTrain.DrawningObjects;
 using RoadTrain.MovementStrategy;
+using RoadTrain.Exceptions;
 
 
 namespace RoadTrain.Generics
diff --git a/RoadTrain/SetGeneric.cs b/RoadTrain/SetGeneric.cs
index 4438f8a..41747fb 100644
--- a/RoadTrain/SetGeneric.cs
+++ b/RoadTrain/SetGeneric.cs
@@ -1,5 +1,5 @@
 using System;
-using RoadTrain;
+using RoadTrain.Exceptions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/RoadTrain/StorageOverflowException.cs b/RoadTrain/StorageOverflowException.cs
index abee299..516ac95 100644
--- a/RoadTrain/StorageOverflowException.cs
+++ b/RoadTrain/StorageOverflowException.cs
@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RoadTrain
+namespace RoadTrain.Exceptions
 {
     [Serializable]
     internal class StorageOverflowException : ApplicationException
diff --git a/RoadTrain/TrainNotFoundException.cs b/RoadTrain/TrainNotFoundException.cs
index 452e15a..5ea2298 100644
--- a/RoadTrain/TrainNotFoundException.cs
+++ b/RoadTrain/TrainNotFoundException.cs
@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RoadTrain
+namespace RoadTrain.Exceptions
 {
     [Serializable]
     internal class TrainNotFoundException : ApplicationException