diff --git a/Massendrucker/Aha-Soft-Universal-Shop-Print.ico b/Massendrucker/Aha-Soft-Universal-Shop-Print.ico
deleted file mode 100644
index e1e43f6..0000000
Binary files a/Massendrucker/Aha-Soft-Universal-Shop-Print.ico and /dev/null differ
diff --git a/Massendrucker.sln b/Mk0.Software.Massendrucker.sln
similarity index 67%
rename from Massendrucker.sln
rename to Mk0.Software.Massendrucker.sln
index 24d26a4..b75213c 100644
--- a/Massendrucker.sln
+++ b/Mk0.Software.Massendrucker.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.438
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Massendrucker", "Massendrucker\Massendrucker.csproj", "{FE8DA07A-ED80-4284-96B6-B76D35A605C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mk0.Software.Massendrucker", "Mk0.Software.Massendrucker\Mk0.Software.Massendrucker.csproj", "{FE8DA07A-ED80-4284-96B6-B76D35A605C8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {11585D3E-5571-4371-84C1-01D0CFF9724F}
+	EndGlobalSection
 EndGlobal
diff --git a/Aha-Soft-Universal-Shop-Print.ico b/Mk0.Software.Massendrucker/Aha-Soft-Universal-Shop-Print.ico
similarity index 100%
rename from Aha-Soft-Universal-Shop-Print.ico
rename to Mk0.Software.Massendrucker/Aha-Soft-Universal-Shop-Print.ico
diff --git a/Massendrucker/App.config b/Mk0.Software.Massendrucker/App.config
similarity index 100%
rename from Massendrucker/App.config
rename to Mk0.Software.Massendrucker/App.config
diff --git a/Massendrucker/Main.Designer.cs b/Mk0.Software.Massendrucker/Main.Designer.cs
similarity index 99%
rename from Massendrucker/Main.Designer.cs
rename to Mk0.Software.Massendrucker/Main.Designer.cs
index e07e066..ec8aa54 100644
--- a/Massendrucker/Main.Designer.cs
+++ b/Mk0.Software.Massendrucker/Main.Designer.cs
@@ -1,4 +1,4 @@
-namespace Massendrucker
+namespace Mk0.Software.Massendrucker
 {
     partial class Main
     {
@@ -218,7 +218,7 @@
             this.MaximizeBox = false;
             this.Name = "Main";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ÖKB Massendrucker";
+            this.Text = "Massendrucker";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             this.ResumeLayout(false);
diff --git a/Massendrucker/Main.cs b/Mk0.Software.Massendrucker/Main.cs
similarity index 99%
rename from Massendrucker/Main.cs
rename to Mk0.Software.Massendrucker/Main.cs
index 6331007..829688d 100644
--- a/Massendrucker/Main.cs
+++ b/Mk0.Software.Massendrucker/Main.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using Word = Microsoft.Office.Interop.Word;
 
-namespace Massendrucker
+namespace Mk0.Software.Massendrucker
 {
     public partial class Main : Form
     {
diff --git a/Massendrucker/Main.resx b/Mk0.Software.Massendrucker/Main.resx
similarity index 100%
rename from Massendrucker/Main.resx
rename to Mk0.Software.Massendrucker/Main.resx
diff --git a/Massendrucker/Massendrucker.csproj b/Mk0.Software.Massendrucker/Mk0.Software.Massendrucker.csproj
similarity index 96%
rename from Massendrucker/Massendrucker.csproj
rename to Mk0.Software.Massendrucker/Mk0.Software.Massendrucker.csproj
index 2ecd376..0879d05 100644
--- a/Massendrucker/Massendrucker.csproj
+++ b/Mk0.Software.Massendrucker/Mk0.Software.Massendrucker.csproj
@@ -66,15 +66,10 @@
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs">
diff --git a/Massendrucker/Program.cs b/Mk0.Software.Massendrucker/Program.cs
similarity index 79%
rename from Massendrucker/Program.cs
rename to Mk0.Software.Massendrucker/Program.cs
index 4d00945..3a8eea4 100644
--- a/Massendrucker/Program.cs
+++ b/Mk0.Software.Massendrucker/Program.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace Massendrucker
+namespace Mk0.Software.Massendrucker
 {
     static class Program
     {
diff --git a/Massendrucker/Properties/AssemblyInfo.cs b/Mk0.Software.Massendrucker/Properties/AssemblyInfo.cs
similarity index 89%
rename from Massendrucker/Properties/AssemblyInfo.cs
rename to Mk0.Software.Massendrucker/Properties/AssemblyInfo.cs
index 8a7d817..1beff51 100644
--- a/Massendrucker/Properties/AssemblyInfo.cs
+++ b/Mk0.Software.Massendrucker/Properties/AssemblyInfo.cs
@@ -1,16 +1,15 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ÖKB Massendrucker")]
+[assembly: AssemblyTitle("Massendrucker")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Massendrucker")]
-[assembly: AssemblyCopyright("Copyright ©  2016 manuelkamper.com")]
+[assembly: AssemblyCopyright("Copyright ©  2016 mk0.at")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Massendrucker/Properties/Resources.Designer.cs b/Mk0.Software.Massendrucker/Properties/Resources.Designer.cs
similarity index 98%
rename from Massendrucker/Properties/Resources.Designer.cs
rename to Mk0.Software.Massendrucker/Properties/Resources.Designer.cs
index 72065d2..31eb7de 100644
--- a/Massendrucker/Properties/Resources.Designer.cs
+++ b/Mk0.Software.Massendrucker/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Massendrucker.Properties
+namespace Mk0.Software.Massendrucker.Properties
 {
 
 
diff --git a/Massendrucker/Properties/Resources.resx b/Mk0.Software.Massendrucker/Properties/Resources.resx
similarity index 100%
rename from Massendrucker/Properties/Resources.resx
rename to Mk0.Software.Massendrucker/Properties/Resources.resx
diff --git a/Massendrucker/Properties/Settings.Designer.cs b/Mk0.Software.Massendrucker/Properties/Settings.Designer.cs
similarity index 95%
rename from Massendrucker/Properties/Settings.Designer.cs
rename to Mk0.Software.Massendrucker/Properties/Settings.Designer.cs
index 5a779c4..1deeae9 100644
--- a/Massendrucker/Properties/Settings.Designer.cs
+++ b/Mk0.Software.Massendrucker/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Massendrucker.Properties
+namespace Mk0.Software.Massendrucker.Properties
 {
 
 
diff --git a/Massendrucker/Properties/Settings.settings b/Mk0.Software.Massendrucker/Properties/Settings.settings
similarity index 100%
rename from Massendrucker/Properties/Settings.settings
rename to Mk0.Software.Massendrucker/Properties/Settings.settings