diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowsDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowsDataModel.cs
deleted file mode 100644
index 7e0fe02e7..000000000
--- a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowsDataModel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Artemis.Plugins.Modules.General.DataModel.Windows
-{
-    public class WindowsDataModel
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/GeneralDataModel.cs
similarity index 77%
rename from src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/DataModels/GeneralDataModel.cs
index 38fb47c35..3c678439a 100644
--- a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs
+++ b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/GeneralDataModel.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Plugins.Modules.General.DataModel.Windows;
+using Artemis.Core.DataModelExpansions;
+using Artemis.Plugins.Modules.General.DataModels.Windows;
 
-namespace Artemis.Plugins.Modules.General.DataModel
+namespace Artemis.Plugins.Modules.General.DataModels
 {
-    public class GeneralDataModel : Core.DataModelExpansions.DataModel
+    public class GeneralDataModel : DataModel
     {
         public GeneralDataModel()
         {
@@ -25,7 +26,7 @@ namespace Artemis.Plugins.Modules.General.DataModel
         public List<TimeDataModel> TestTimeList { get; set; }
     }
 
-    public class TimeDataModel : Core.DataModelExpansions.DataModel
+    public class TimeDataModel : DataModel
     {
         public DateTime CurrentTime { get; set; }
         public DateTime CurrentTimeUTC { get; set; }
diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowDataModel.cs
similarity index 91%
rename from src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs
rename to src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowDataModel.cs
index e8e38fa96..be1af9789 100644
--- a/src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs
+++ b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowDataModel.cs
@@ -2,7 +2,7 @@
 using Artemis.Core;
 using Artemis.Core.DataModelExpansions;
 
-namespace Artemis.Plugins.Modules.General.DataModel.Windows
+namespace Artemis.Plugins.Modules.General.DataModels.Windows
 {
     public class WindowDataModel
     {
diff --git a/src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowsDataModel.cs b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowsDataModel.cs
new file mode 100644
index 000000000..c3ea381ed
--- /dev/null
+++ b/src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowsDataModel.cs
@@ -0,0 +1,6 @@
+namespace Artemis.Plugins.Modules.General.DataModels.Windows
+{
+    public class WindowsDataModel
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
index 2060e2376..32f1455fa 100644
--- a/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
+++ b/src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Artemis.Core.Modules;
-using Artemis.Plugins.Modules.General.DataModel;
-using Artemis.Plugins.Modules.General.DataModel.Windows;
+using Artemis.Plugins.Modules.General.DataModels;
+using Artemis.Plugins.Modules.General.DataModels.Windows;
 using Artemis.Plugins.Modules.General.Utilities;
 using Artemis.Plugins.Modules.General.ViewModels;