diff --git a/BackupEssentials/App.xaml.cs b/BackupEssentials/App.xaml.cs
index 3b6c9a9..a2c7da5 100644
--- a/BackupEssentials/App.xaml.cs
+++ b/BackupEssentials/App.xaml.cs
@@ -1,4 +1,5 @@
 using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using BackupEssentials.Pages;
 using BackupEssentials.Utils;
 using System;
diff --git a/BackupEssentials/BackupEssentials.csproj b/BackupEssentials/BackupEssentials.csproj
index f9b9f81..7cc9b7a 100644
--- a/BackupEssentials/BackupEssentials.csproj
+++ b/BackupEssentials/BackupEssentials.csproj
@@ -80,8 +80,8 @@
     <Compile Include="Backup\BackupReport.cs" />
     <Compile Include="Backup\BackupRunInfo.cs" />
     <Compile Include="Backup\BackupRunner.cs" />
-    <Compile Include="Backup\DataStorage.cs" />
-    <Compile Include="Backup\ExplorerIntegration.cs" />
+    <Compile Include="Data\DataStorage.cs" />
+    <Compile Include="Data\ExplorerIntegration.cs" />
     <Compile Include="Backup\IO\IOAction.cs" />
     <Compile Include="Backup\IO\IOType.cs" />
     <Compile Include="Pages\About.xaml.cs">
diff --git a/BackupEssentials/Backup/DataStorage.cs b/BackupEssentials/Data/DataStorage.cs
similarity index 98%
rename from BackupEssentials/Backup/DataStorage.cs
rename to BackupEssentials/Data/DataStorage.cs
index 4924ee2..317da91 100644
--- a/BackupEssentials/Backup/DataStorage.cs
+++ b/BackupEssentials/Data/DataStorage.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
-namespace BackupEssentials.Backup{
+namespace BackupEssentials.Backup.Data{
     class DataStorage{
         public enum Type{
             Locations
diff --git a/BackupEssentials/Backup/ExplorerIntegration.cs b/BackupEssentials/Data/ExplorerIntegration.cs
similarity index 99%
rename from BackupEssentials/Backup/ExplorerIntegration.cs
rename to BackupEssentials/Data/ExplorerIntegration.cs
index 76c03d1..bb295ec 100644
--- a/BackupEssentials/Backup/ExplorerIntegration.cs
+++ b/BackupEssentials/Data/ExplorerIntegration.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 
-namespace BackupEssentials.Backup{
+namespace BackupEssentials.Backup.Data{
     static class ExplorerIntegration{
         /*
         HKCR\*\shell\<appname>
diff --git a/BackupEssentials/MainWindow.xaml.cs b/BackupEssentials/MainWindow.xaml.cs
index b6ac584..4d4afd2 100644
--- a/BackupEssentials/MainWindow.xaml.cs
+++ b/BackupEssentials/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using BackupEssentials.Controls;
 using BackupEssentials.Pages;
 using System;
diff --git a/BackupEssentials/Pages/Backup.xaml.cs b/BackupEssentials/Pages/Backup.xaml.cs
index 28542e8..01e5c0a 100644
--- a/BackupEssentials/Pages/Backup.xaml.cs
+++ b/BackupEssentials/Pages/Backup.xaml.cs
@@ -1,4 +1,5 @@
 using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/BackupEssentials/Pages/BackupDrop.xaml.cs b/BackupEssentials/Pages/BackupDrop.xaml.cs
index b418b0d..c7b8603 100644
--- a/BackupEssentials/Pages/BackupDrop.xaml.cs
+++ b/BackupEssentials/Pages/BackupDrop.xaml.cs
@@ -1,4 +1,4 @@
-using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using System;
 using System.Diagnostics;
 using System.IO;
diff --git a/BackupEssentials/Pages/BackupEdit.xaml.cs b/BackupEssentials/Pages/BackupEdit.xaml.cs
index b384227..d61d45d 100644
--- a/BackupEssentials/Pages/BackupEdit.xaml.cs
+++ b/BackupEssentials/Pages/BackupEdit.xaml.cs
@@ -1,4 +1,5 @@
 using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
diff --git a/BackupEssentials/Pages/Settings.xaml.cs b/BackupEssentials/Pages/Settings.xaml.cs
index 9211314..459bb01 100644
--- a/BackupEssentials/Pages/Settings.xaml.cs
+++ b/BackupEssentials/Pages/Settings.xaml.cs
@@ -1,4 +1,4 @@
-using BackupEssentials.Backup;
+using BackupEssentials.Backup.Data;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Windows;