diff --git a/VectoMockup/VectoMockup/Simulation/MockupRun.cs b/VectoMockup/VectoMockup/Simulation/MockupRun.cs
index 2fd82a4c1f43e9e566afe2ade2ff5e9910a61320..e349b22deaf53b7c474c41d14b5019f3453f388a 100644
--- a/VectoMockup/VectoMockup/Simulation/MockupRun.cs
+++ b/VectoMockup/VectoMockup/Simulation/MockupRun.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCore.Models.Connector.Ports.Impl;
-using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.Models.Simulation;
+using TUGraz.VectoCore.Models.Simulation.Impl;
 
-namespace TUGraz.VectoCore.Models.Simulation.Impl.Mockup
+namespace TUGraz.VectoMockup.Simulation
 {
     public class MockupRun : VectoRun
 	{
diff --git a/VectoMockup/VectoMockup/Simulation/MockupRunData.cs b/VectoMockup/VectoMockup/Simulation/MockupRunData.cs
deleted file mode 100644
index fc05f6cc4f4e9dfe150390c0b8f9c8b92aa2bbac..0000000000000000000000000000000000000000
--- a/VectoMockup/VectoMockup/Simulation/MockupRunData.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TUGraz.VectoMockup.RunData
-{
-    internal class MockupRunData
-    {
-    }
-}