diff --git a/ATXConfigTest/ATXConfigTest.csproj b/ATXConfigTest/ATXConfigTest.csproj
index df442c4a425b7e5021594474e2679faa83e1eabc..f5d0375002890d60e62c428dc611d562d468454f 100644
--- a/ATXConfigTest/ATXConfigTest.csproj
+++ b/ATXConfigTest/ATXConfigTest.csproj
@@ -48,9 +48,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+    <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXSerializables</Name>
+      <Name>ATXCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXConfigTest/AutoTxConfigTest.cs b/ATXConfigTest/AutoTxConfigTest.cs
index a649bc0dec259e99a511d67800a8d3b439499ee2..100291fe1785b6e118a2fe5a4e6fb6d84314134d 100644
--- a/ATXConfigTest/AutoTxConfigTest.cs
+++ b/ATXConfigTest/AutoTxConfigTest.cs
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using ATXSerializables;
+using ATXCommon.Serializables;
 
 namespace ATXConfigTest
 {
diff --git a/ATXSerializables/ATXSerializables.csproj b/ATXSerializables/ATXCommon.csproj
similarity index 89%
rename from ATXSerializables/ATXSerializables.csproj
rename to ATXSerializables/ATXCommon.csproj
index 0b6ec7c14655fd6bce4af74198b074db4b8e7b33..d6477bd0bdea121eb0c26d211e27aef800018d1d 100644
--- a/ATXSerializables/ATXSerializables.csproj
+++ b/ATXSerializables/ATXCommon.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ATXSerializables</RootNamespace>
-    <AssemblyName>ATXSerializables</AssemblyName>
+    <RootNamespace>ATXCommon</RootNamespace>
+    <AssemblyName>ATXCommon</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -40,10 +40,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DriveToCheck.cs" />
-    <Compile Include="ServiceConfig.cs" />
+    <Compile Include="Serializables\DriveToCheck.cs" />
+    <Compile Include="Serializables\ServiceConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceStatus.cs" />
+    <Compile Include="Serializables\ServiceStatus.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ATXSerializables/DriveToCheck.cs b/ATXSerializables/Serializables/DriveToCheck.cs
similarity index 93%
rename from ATXSerializables/DriveToCheck.cs
rename to ATXSerializables/Serializables/DriveToCheck.cs
index 7d52e74420d89dd81a53bf5505e69c8ee2df1a52..35a0242343bca5da9695bdb907eb5e117ebd7819 100644
--- a/ATXSerializables/DriveToCheck.cs
+++ b/ATXSerializables/Serializables/DriveToCheck.cs
@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace ATXSerializables
+namespace ATXCommon.Serializables
 {
     /// <summary>
     /// Helper class for the nested SpaceMonitoring sections.
diff --git a/ATXSerializables/ServiceConfig.cs b/ATXSerializables/Serializables/ServiceConfig.cs
similarity index 99%
rename from ATXSerializables/ServiceConfig.cs
rename to ATXSerializables/Serializables/ServiceConfig.cs
index 512e426421acc5e1e134447e86f1ba30dd267fd8..9f5e635c53a3fc2e1da3ccfd686c06ad9a693fb0 100644
--- a/ATXSerializables/ServiceConfig.cs
+++ b/ATXSerializables/Serializables/ServiceConfig.cs
@@ -4,7 +4,7 @@ using System.Configuration;
 using System.IO;
 using System.Xml.Serialization;
 
-namespace ATXSerializables
+namespace ATXCommon.Serializables
 {
     /// <summary>
     /// configuration class based on xml
diff --git a/ATXSerializables/ServiceStatus.cs b/ATXSerializables/Serializables/ServiceStatus.cs
similarity index 99%
rename from ATXSerializables/ServiceStatus.cs
rename to ATXSerializables/Serializables/ServiceStatus.cs
index 5bdc52f41e790961ba74026e49fc70f909b4aa10..9d88b50b0949fa34673462e0f87441e5aaa2229d 100644
--- a/ATXSerializables/ServiceStatus.cs
+++ b/ATXSerializables/Serializables/ServiceStatus.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Xml.Serialization;
 
-namespace ATXSerializables
+namespace ATXCommon.Serializables
 {
     [Serializable]
     public class ServiceStatus
diff --git a/ATXService.sln b/ATXService.sln
index 82264d7da184937098be16411651d4af40bf0bd7..7ce63be1fa780b2bed144be4ebed8a6ba76180e9 100644
--- a/ATXService.sln
+++ b/ATXService.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXProject", "AutoTx\ATXProject.csproj", "{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXSerializables", "ATXSerializables\ATXSerializables.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXCommon", "ATXSerializables\ATXCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXConfigTest", "ATXConfigTest\ATXConfigTest.csproj", "{81E0A5AC-0E0D-4F98-B399-41A58612EF33}"
 EndProject
diff --git a/ATXTray/ATXTray.csproj b/ATXTray/ATXTray.csproj
index 3fcf8f0c648eab9bd7051bff99b5fd50acedb61d..667121e89fab2f67985fc0fd4c524a9fcb09e2f6 100644
--- a/ATXTray/ATXTray.csproj
+++ b/ATXTray/ATXTray.csproj
@@ -89,9 +89,9 @@
     <Content Include="AutoTx.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+    <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXSerializables</Name>
+      <Name>ATXCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ATXTray/AutoTxTray.cs b/ATXTray/AutoTxTray.cs
index d149a15eca144e410cbb9bec40bd9f7f768e8463..5f13a9e0c56ead34b72297cd23e8a7a9ced19ae8 100644
--- a/ATXTray/AutoTxTray.cs
+++ b/ATXTray/AutoTxTray.cs
@@ -4,8 +4,8 @@ using System.Timers;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using ATXCommon.Serializables;
 using Microsoft.WindowsAPICodePack.Dialogs;
-using ATXSerializables;
 using Timer = System.Timers.Timer;
 
 namespace ATXTray
diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj
index 5d3ca82039312efa17dffc96974af331c30b88c0..15cfffa998cfbf6cd92f4988e80657a9b2fd6f1c 100644
--- a/AutoTx/ATXProject.csproj
+++ b/AutoTx/ATXProject.csproj
@@ -148,9 +148,9 @@
     <None Include="Resources\BuildCommit.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ATXSerializables\ATXSerializables.csproj">
+    <ProjectReference Include="..\ATXSerializables\ATXCommon.csproj">
       <Project>{166D65D5-EE10-4364-8AA3-4D86BA5CE244}</Project>
-      <Name>ATXSerializables</Name>
+      <Name>ATXCommon</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs
index e2cacbcbfb1a7917bb44d7943bee8f43ad75776a..4a9426ec6665d1fe2229dac9a11c4a2e211ea4aa 100644
--- a/AutoTx/AutoTx.cs
+++ b/AutoTx/AutoTx.cs
@@ -9,7 +9,7 @@ using System.Timers;
 using System.DirectoryServices.AccountManagement;
 using System.Globalization;
 using System.Management;
-using ATXSerializables;
+using ATXCommon.Serializables;
 using RoboSharp;
 
 namespace AutoTx