diff --git a/AutoTx/ATXProject.csproj b/ATxService/ATxService.csproj
similarity index 98%
rename from AutoTx/ATXProject.csproj
rename to ATxService/ATxService.csproj
index 6099401c6b80523a07b444f9bd03beb83f800f6d..f799eb14a91363674bf17b0717faa3e126a52535 100644
--- a/AutoTx/ATXProject.csproj
+++ b/ATxService/ATxService.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AutoTx</RootNamespace>
+    <RootNamespace>ATxService</RootNamespace>
     <AssemblyName>AutoTx</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -47,7 +47,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>AutoTx.Program</StartupObject>
+    <StartupObject>ATxService.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
diff --git a/AutoTx/App.config b/ATxService/App.config
similarity index 100%
rename from AutoTx/App.config
rename to ATxService/App.config
diff --git a/AutoTx/AutoTx.Designer.cs b/ATxService/AutoTx.Designer.cs
similarity index 98%
rename from AutoTx/AutoTx.Designer.cs
rename to ATxService/AutoTx.Designer.cs
index cc12caf49e3d9158465cdc3a28a565839d4ac8d6..f331cd3e7ce92805aa56a2a523e728d3d17e5165 100644
--- a/AutoTx/AutoTx.Designer.cs
+++ b/ATxService/AutoTx.Designer.cs
@@ -1,4 +1,4 @@
-namespace AutoTx
+namespace ATxService
 {
     partial class AutoTx
     {
diff --git a/AutoTx/AutoTx.cs b/ATxService/AutoTx.cs
similarity index 99%
rename from AutoTx/AutoTx.cs
rename to ATxService/AutoTx.cs
index 1a14cbc716ad185d7234138db2d6e3c4d00d39d8..72534e90b9bf5e1def665e68a57ed3bf9a7a503a 100644
--- a/AutoTx/AutoTx.cs
+++ b/ATxService/AutoTx.cs
@@ -14,7 +14,7 @@ using NLog.Config;
 using NLog.Targets;
 using RoboSharp;
 
-namespace AutoTx
+namespace ATxService
 {
     public partial class AutoTx : ServiceBase
     {
diff --git a/AutoTx/AutoTx.resx b/ATxService/AutoTx.resx
similarity index 100%
rename from AutoTx/AutoTx.resx
rename to ATxService/AutoTx.resx
diff --git a/AutoTx/Email.cs b/ATxService/Email.cs
similarity index 99%
rename from AutoTx/Email.cs
rename to ATxService/Email.cs
index 2b03b78b91796a38c7f2d9b6dccdda2c23e7f4cb..986de18560cc3088178b70aecffb49eaec3c2187 100644
--- a/AutoTx/Email.cs
+++ b/ATxService/Email.cs
@@ -6,7 +6,7 @@ using System.Net.Mail;
 using System.Text;
 using ATxCommon;
 
-namespace AutoTx
+namespace ATxService
 {
     public partial class AutoTx
     {
diff --git a/AutoTx/Program.cs b/ATxService/Program.cs
similarity index 97%
rename from AutoTx/Program.cs
rename to ATxService/Program.cs
index 1d63e1e20e7e17ffefe1f496911c5802a58f3e3c..cfab9c97b797027f3be7f73eb70c65a6035fe31a 100644
--- a/AutoTx/Program.cs
+++ b/ATxService/Program.cs
@@ -2,7 +2,7 @@
 using System.ServiceProcess;
 using System.IO;
 
-namespace AutoTx
+namespace ATxService
 {
     static class Program
     {
diff --git a/AutoTx/ProjectInstaller.Designer.cs b/ATxService/ProjectInstaller.Designer.cs
similarity index 98%
rename from AutoTx/ProjectInstaller.Designer.cs
rename to ATxService/ProjectInstaller.Designer.cs
index d4356e032c67e9f97746e66baf157a4fa2000c83..a128c4a8753df576ccf3d340739641de7c5f46de 100644
--- a/AutoTx/ProjectInstaller.Designer.cs
+++ b/ATxService/ProjectInstaller.Designer.cs
@@ -1,4 +1,4 @@
-namespace AutoTx
+namespace ATxService
 {
     partial class ProjectInstaller
     {
diff --git a/AutoTx/ProjectInstaller.cs b/ATxService/ProjectInstaller.cs
similarity index 92%
rename from AutoTx/ProjectInstaller.cs
rename to ATxService/ProjectInstaller.cs
index 841fe6536250e211931cc3ff094d2ee63816cf59..6692ea9f7aa3fe9580780ef045bc12271e92d47a 100644
--- a/AutoTx/ProjectInstaller.cs
+++ b/ATxService/ProjectInstaller.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace AutoTx
+namespace ATxService
 {
     [RunInstaller(true)]
     public partial class ProjectInstaller : System.Configuration.Install.Installer
diff --git a/AutoTx/ProjectInstaller.resx b/ATxService/ProjectInstaller.resx
similarity index 100%
rename from AutoTx/ProjectInstaller.resx
rename to ATxService/ProjectInstaller.resx
diff --git a/AutoTx/Properties/AssemblyInfo.cs b/ATxService/Properties/AssemblyInfo.cs
similarity index 96%
rename from AutoTx/Properties/AssemblyInfo.cs
rename to ATxService/Properties/AssemblyInfo.cs
index cddd33ac5f5c9cf11e20cba6ce6bbfa7c6f43094..0ae1c6aad63d704f218057d273fb2f0bfaa804ef 100644
--- a/AutoTx/Properties/AssemblyInfo.cs
+++ b/ATxService/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("IMCF, Biozentrum, University of Basel")]
 [assembly: AssemblyProduct("AutoTx")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/AutoTx/Properties/Resources.Designer.cs b/ATxService/Properties/Resources.Designer.cs
similarity index 91%
rename from AutoTx/Properties/Resources.Designer.cs
rename to ATxService/Properties/Resources.Designer.cs
index adfac6303cf66b8ae068e5d619626e426a7e1395..26be70d215a1b4caeef7b4d575ef0e84b8d29e07 100644
--- a/AutoTx/Properties/Resources.Designer.cs
+++ b/ATxService/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AutoTx.Properties {
+namespace ATxService.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace AutoTx.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    var temp = new global::System.Resources.ResourceManager("AutoTx.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ATxService.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -61,7 +61,7 @@ namespace AutoTx.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to autotransfer-v1-134-g04a73b1
+        ///   Looks up a localized string similar to autotransfer-v1-236-gc48c399
         ///.
         /// </summary>
         internal static string BuildCommit {
@@ -71,7 +71,7 @@ namespace AutoTx.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 2017-12-21 10:42:03
+        ///   Looks up a localized string similar to 2018-02-01 01:23:43
         ///.
         /// </summary>
         internal static string BuildDate {
diff --git a/AutoTx/Properties/Resources.resx b/ATxService/Properties/Resources.resx
similarity index 100%
rename from AutoTx/Properties/Resources.resx
rename to ATxService/Properties/Resources.resx
diff --git a/AutoTx/Resources/.gitignore b/ATxService/Resources/.gitignore
similarity index 100%
rename from AutoTx/Resources/.gitignore
rename to ATxService/Resources/.gitignore
diff --git a/AutoTx/Resources/Mail-Templates/DiskSpace-Low.txt b/ATxService/Resources/Mail-Templates/DiskSpace-Low.txt
similarity index 100%
rename from AutoTx/Resources/Mail-Templates/DiskSpace-Low.txt
rename to ATxService/Resources/Mail-Templates/DiskSpace-Low.txt
diff --git a/AutoTx/Resources/Mail-Templates/Transfer-Interrupted.txt b/ATxService/Resources/Mail-Templates/Transfer-Interrupted.txt
similarity index 100%
rename from AutoTx/Resources/Mail-Templates/Transfer-Interrupted.txt
rename to ATxService/Resources/Mail-Templates/Transfer-Interrupted.txt
diff --git a/AutoTx/Resources/Mail-Templates/Transfer-Success.txt b/ATxService/Resources/Mail-Templates/Transfer-Success.txt
similarity index 100%
rename from AutoTx/Resources/Mail-Templates/Transfer-Success.txt
rename to ATxService/Resources/Mail-Templates/Transfer-Success.txt
diff --git a/AutoTx/Resources/RoboCopyOptions.txt b/ATxService/Resources/RoboCopyOptions.txt
similarity index 100%
rename from AutoTx/Resources/RoboCopyOptions.txt
rename to ATxService/Resources/RoboCopyOptions.txt
diff --git a/AutoTx/Resources/auto-tx-logo.png b/ATxService/Resources/auto-tx-logo.png
similarity index 100%
rename from AutoTx/Resources/auto-tx-logo.png
rename to ATxService/Resources/auto-tx-logo.png
diff --git a/AutoTx/Resources/configuration-example.xml b/ATxService/Resources/configuration-example.xml
similarity index 100%
rename from AutoTx/Resources/configuration-example.xml
rename to ATxService/Resources/configuration-example.xml
diff --git a/AutoTx/Resources/status-example.xml b/ATxService/Resources/status-example.xml
similarity index 100%
rename from AutoTx/Resources/status-example.xml
rename to ATxService/Resources/status-example.xml
diff --git a/AutoTx/RoboCommand.cs b/ATxService/RoboCommand.cs
similarity index 99%
rename from AutoTx/RoboCommand.cs
rename to ATxService/RoboCommand.cs
index bd1ad1937028e6968b0cd812bc94131876ac1c65..d4ce7d18b45f75a823d36869ac9989c6e2bf8ad7 100644
--- a/AutoTx/RoboCommand.cs
+++ b/ATxService/RoboCommand.cs
@@ -4,7 +4,7 @@ using System.Management;
 using ATxCommon;
 using RoboSharp;
 
-namespace AutoTx
+namespace ATxService
 {
     public partial class AutoTx
     {
diff --git a/AutoTx/packages.config b/ATxService/packages.config
similarity index 100%
rename from AutoTx/packages.config
rename to ATxService/packages.config
diff --git a/AutoTx.sln b/AutoTx.sln
index 35e8ffc7eb18866c0d260de3ec027307f67824dd..220f201c54073dc4e27f0f36b4d5efb5ca980719 100644
--- a/AutoTx.sln
+++ b/AutoTx.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxService", "ATxService\ATxService.csproj", "{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxCommon", "ATxCommon\ATxCommon.csproj", "{166D65D5-EE10-4364-8AA3-4D86BA5CE244}"
 EndProject
diff --git a/Scripts/Make-Package.ps1 b/Scripts/Make-Package.ps1
index ed300f4b541bb821c0657c643e59c85d4c52b77f..84260635f04e623700bed510de1e809ef936dd73 100644
--- a/Scripts/Make-Package.ps1
+++ b/Scripts/Make-Package.ps1
@@ -1,4 +1,4 @@
-$ResourceDir = "..\AutoTx\Resources"
+$ResourceDir = "..\ATxService\Resources"
 $TemplateDir = "$($ResourceDir)\Mail-Templates"
 
 try {
@@ -19,7 +19,7 @@ catch {
 
 $PkgDir = $BuildDate -replace ':','-' -replace ' ','_'
 $PkgDir = "build_" + $PkgDir
-$BinariesDir = "..\AutoTx\bin\$($BuildConfiguration)"
+$BinariesDir = "..\ATxService\bin\$($BuildConfiguration)"
 
 Write-Host "Creating package [$($PkgDir)] using binaries from [$($BinariesDir)]"