diff --git a/DDMonorepo.sln b/DDMonorepo.sln
index 5a05efbb..5a638e3c 100644
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -40,22 +40,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{59
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging.Test", "Modules.Logging.Test\Logging.Test.vbproj", "{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDZUGFeRDService", "DDZUGFeRDService\DDZUGFeRDService.vbproj", "{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Interfaces", "Modules.Interfaces\Interfaces.vbproj", "{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZUGFeRDTest", "GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj", "{16156434-E471-43F1-8030-76A0DA17CD5A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "DD_CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUIs.Test.GUI_EDMI\GUI_EDMI.vbproj", "{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "GUIs.ClientSuite\ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IDBService", "SERVICES\DDEDM_NetworkService\IDBService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}"
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ADSyncTest", "GUIs.Test.ADSyncTest\ADSyncTest.vbproj", "{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}"
@@ -100,8 +92,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.GraphQLTest", "GU
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.DocumentViewerTest", "GUIs.Test.DocumentViewerTest\GUIs.Test.DocumentViewerTest.vbproj", "{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
@@ -110,6 +100,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File", "EDMI.File\EDMI
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "Modules.EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File.Test", "EDMI.File.Test\EDMI.File.Test.vbproj", "{16857A4E-2609-47E6-9C35-7669D64DD040}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService", "Service.EDMIService\EDMIService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "Services.EmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "Services.CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDZUGFeRDService", "Services.ZUGFeRDService\DDZUGFeRDService.vbproj", "{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "Services.LicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -152,10 +154,6 @@ Global
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -164,10 +162,6 @@ Global
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -176,14 +170,6 @@ Global
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -268,10 +254,6 @@ Global
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -284,6 +266,30 @@ Global
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -298,14 +304,10 @@ Global
 		{44982F9B-6116-44E2-85D0-F39650B1EF99} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{16156434-E471-43F1-8030-76A0DA17CD5A} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
-		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
@@ -327,10 +329,15 @@ Global
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
-		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}
 		{1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{25017513-0D97-49D3-98D7-BA76D9B251B0} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}
diff --git a/GUIs.ClientSuite/ClientSuite.vbproj b/GUIs.ClientSuite/ClientSuite.vbproj
index 661fe84b..adca8ce1 100644
--- a/GUIs.ClientSuite/ClientSuite.vbproj
+++ b/GUIs.ClientSuite/ClientSuite.vbproj
@@ -512,8 +512,8 @@
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\EDMIService.vbproj">
-      <Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
+    <ProjectReference Include="..\Service.EDMIService\EDMIService.vbproj">
+      <Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project>
       <Name>EDMIService</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vbproj b/SERVICES/DDEDM_NetworkService/IDBService.vbproj
deleted file mode 100644
index 2c462137..00000000
--- a/SERVICES/DDEDM_NetworkService/IDBService.vbproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <StartupObject>DigitalData.Services.IDBService.WindowsService</StartupObject>
-    <RootNamespace>DigitalData.Services.IDBService</RootNamespace>
-    <AssemblyName>IDBService</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>IDBService.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>IDBService.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.Install" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AppConfig.vb" />
-    <Compile Include="Results\BaseResult.vb" />
-    <Compile Include="Results\ContainerResult.vb" />
-    <Compile Include="Results\DocumentResult.vb" />
-    <Compile Include="Exceptions.vb" />
-    <Compile Include="Results\DatabaseResult.vb" />
-    <Compile Include="IDBService.vb" />
-    <Compile Include="Results\DocumentResult2.vb" />
-    <Compile Include="Results\IndexResult.vb" />
-    <Compile Include="WindowsService.vb">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="IIDBService.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="ProjectInstaller.vb">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Request.vb" />
-    <Compile Include="SettingsModule.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ProjectInstaller.resx">
-      <DependentUpon>ProjectInstaller.vb</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Modules.Database\Database.vbproj">
-      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Filesystem\Filesystem.vbproj">
-      <Project>{991D0231-4623-496D-8BD0-9CA906029CBC}</Project>
-      <Name>Filesystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Logging\Logging.vbproj">
-      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>
\ No newline at end of file
diff --git a/SERVICES/DDEDM_NetworkService/App.config b/Service.EDMIService/App.config
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/App.config
rename to Service.EDMIService/App.config
diff --git a/SERVICES/DDEDM_NetworkService/AppConfig.vb b/Service.EDMIService/AppConfig.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/AppConfig.vb
rename to Service.EDMIService/AppConfig.vb
diff --git a/SERVICES/DDEDM_NetworkService/EDMIService.vb b/Service.EDMIService/EDMIService.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/EDMIService.vb
rename to Service.EDMIService/EDMIService.vb
diff --git a/SERVICES/DDEDM_NetworkService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj
similarity index 96%
rename from SERVICES/DDEDM_NetworkService/EDMIService.vbproj
rename to Service.EDMIService/EDMIService.vbproj
index fe9c0ecb..29233af6 100644
--- a/SERVICES/DDEDM_NetworkService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -145,7 +145,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Modules.Database\Database.vbproj">
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
       <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
       <Name>Database</Name>
     </ProjectReference>
@@ -153,11 +153,11 @@
       <Project>{5B1171DC-FFFE-4813-A20D-786AAE47B320}</Project>
       <Name>EDMI.API</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Filesystem\Filesystem.vbproj">
+    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
       <Project>{991D0231-4623-496D-8BD0-9CA906029CBC}</Project>
       <Name>Filesystem</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Logging\Logging.vbproj">
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
       <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
       <Name>Logging</Name>
     </ProjectReference>
diff --git a/SERVICES/DDEDM_NetworkService/Exceptions.vb b/Service.EDMIService/Exceptions.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Exceptions.vb
rename to Service.EDMIService/Exceptions.vb
diff --git a/SERVICES/DDEDM_NetworkService/IDBService.vb b/Service.EDMIService/IDBService.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/IDBService.vb
rename to Service.EDMIService/IDBService.vb
diff --git a/SERVICES/DDEDM_NetworkService/IEDMIService.vb b/Service.EDMIService/IEDMIService.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/IEDMIService.vb
rename to Service.EDMIService/IEDMIService.vb
diff --git a/SERVICES/DDEDM_NetworkService/IIDBService.vb b/Service.EDMIService/IIDBService.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/IIDBService.vb
rename to Service.EDMIService/IIDBService.vb
diff --git a/DDLicenseService/My Project/Application.Designer.vb b/Service.EDMIService/My Project/Application.Designer.vb
similarity index 100%
rename from DDLicenseService/My Project/Application.Designer.vb
rename to Service.EDMIService/My Project/Application.Designer.vb
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Application.myapp b/Service.EDMIService/My Project/Application.myapp
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Application.myapp
rename to Service.EDMIService/My Project/Application.myapp
diff --git a/SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb b/Service.EDMIService/My Project/AssemblyInfo.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/AssemblyInfo.vb
rename to Service.EDMIService/My Project/AssemblyInfo.vb
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb b/Service.EDMIService/My Project/Resources.Designer.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Resources.Designer.vb
rename to Service.EDMIService/My Project/Resources.Designer.vb
diff --git a/DDEmailService/My Project/Resources.resx b/Service.EDMIService/My Project/Resources.resx
similarity index 100%
rename from DDEmailService/My Project/Resources.resx
rename to Service.EDMIService/My Project/Resources.resx
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb b/Service.EDMIService/My Project/Settings.Designer.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Settings.Designer.vb
rename to Service.EDMIService/My Project/Settings.Designer.vb
diff --git a/DDLicenseService/My Project/Settings.settings b/Service.EDMIService/My Project/Settings.settings
similarity index 100%
rename from DDLicenseService/My Project/Settings.settings
rename to Service.EDMIService/My Project/Settings.settings
diff --git a/SERVICES/DDEDM_NetworkService/ProjectInstaller.resx b/Service.EDMIService/ProjectInstaller.resx
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/ProjectInstaller.resx
rename to Service.EDMIService/ProjectInstaller.resx
diff --git a/DDLicenseService/ProjectInstaller.vb b/Service.EDMIService/ProjectInstaller.vb
similarity index 100%
rename from DDLicenseService/ProjectInstaller.vb
rename to Service.EDMIService/ProjectInstaller.vb
diff --git a/SERVICES/DDEDM_NetworkService/Request.vb b/Service.EDMIService/Request.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Request.vb
rename to Service.EDMIService/Request.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb b/Service.EDMIService/Results/BaseResult.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/BaseResult.vb
rename to Service.EDMIService/Results/BaseResult.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb b/Service.EDMIService/Results/ContainerResult.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb
rename to Service.EDMIService/Results/ContainerResult.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb b/Service.EDMIService/Results/DatabaseResult.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb
rename to Service.EDMIService/Results/DatabaseResult.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb b/Service.EDMIService/Results/DocumentResult.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb
rename to Service.EDMIService/Results/DocumentResult.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/DocumentResult2.vb b/Service.EDMIService/Results/DocumentResult2.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/DocumentResult2.vb
rename to Service.EDMIService/Results/DocumentResult2.vb
diff --git a/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb b/Service.EDMIService/Results/IndexResult.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
rename to Service.EDMIService/Results/IndexResult.vb
diff --git a/SERVICES/DDEDM_NetworkService/SettingsModule.vb b/Service.EDMIService/SettingsModule.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/SettingsModule.vb
rename to Service.EDMIService/SettingsModule.vb
diff --git a/SERVICES/DDEDM_NetworkService/WindowsService.vb b/Service.EDMIService/WindowsService.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/WindowsService.vb
rename to Service.EDMIService/WindowsService.vb
diff --git a/SERVICES/DDEDM_NetworkService/packages.config b/Service.EDMIService/packages.config
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/packages.config
rename to Service.EDMIService/packages.config
diff --git a/DD_CommunicationService/App.config b/Services.CommunicationService/App.config
similarity index 100%
rename from DD_CommunicationService/App.config
rename to Services.CommunicationService/App.config
diff --git a/DD_CommunicationService/DD_CommunicationService.vbproj b/Services.CommunicationService/DD_CommunicationService.vbproj
similarity index 100%
rename from DD_CommunicationService/DD_CommunicationService.vbproj
rename to Services.CommunicationService/DD_CommunicationService.vbproj
diff --git a/DDEmailService/My Project/Application.Designer.vb b/Services.CommunicationService/My Project/Application.Designer.vb
similarity index 100%
rename from DDEmailService/My Project/Application.Designer.vb
rename to Services.CommunicationService/My Project/Application.Designer.vb
diff --git a/DDEmailService/My Project/Application.myapp b/Services.CommunicationService/My Project/Application.myapp
similarity index 100%
rename from DDEmailService/My Project/Application.myapp
rename to Services.CommunicationService/My Project/Application.myapp
diff --git a/DD_CommunicationService/My Project/AssemblyInfo.vb b/Services.CommunicationService/My Project/AssemblyInfo.vb
similarity index 100%
rename from DD_CommunicationService/My Project/AssemblyInfo.vb
rename to Services.CommunicationService/My Project/AssemblyInfo.vb
diff --git a/DD_CommunicationService/My Project/Resources.Designer.vb b/Services.CommunicationService/My Project/Resources.Designer.vb
similarity index 100%
rename from DD_CommunicationService/My Project/Resources.Designer.vb
rename to Services.CommunicationService/My Project/Resources.Designer.vb
diff --git a/DDLicenseService/My Project/Resources.resx b/Services.CommunicationService/My Project/Resources.resx
similarity index 100%
rename from DDLicenseService/My Project/Resources.resx
rename to Services.CommunicationService/My Project/Resources.resx
diff --git a/DD_CommunicationService/My Project/Settings.Designer.vb b/Services.CommunicationService/My Project/Settings.Designer.vb
similarity index 100%
rename from DD_CommunicationService/My Project/Settings.Designer.vb
rename to Services.CommunicationService/My Project/Settings.Designer.vb
diff --git a/DD_CommunicationService/My Project/Settings.settings b/Services.CommunicationService/My Project/Settings.settings
similarity index 100%
rename from DD_CommunicationService/My Project/Settings.settings
rename to Services.CommunicationService/My Project/Settings.settings
diff --git a/DD_CommunicationService/MyComService.Designer.vb b/Services.CommunicationService/MyComService.Designer.vb
similarity index 100%
rename from DD_CommunicationService/MyComService.Designer.vb
rename to Services.CommunicationService/MyComService.Designer.vb
diff --git a/DD_CommunicationService/MyComService.resx b/Services.CommunicationService/MyComService.resx
similarity index 100%
rename from DD_CommunicationService/MyComService.resx
rename to Services.CommunicationService/MyComService.resx
diff --git a/DD_CommunicationService/MyComService.vb b/Services.CommunicationService/MyComService.vb
similarity index 100%
rename from DD_CommunicationService/MyComService.vb
rename to Services.CommunicationService/MyComService.vb
diff --git a/DD_CommunicationService/ProjectInstaller.Designer.vb b/Services.CommunicationService/ProjectInstaller.Designer.vb
similarity index 100%
rename from DD_CommunicationService/ProjectInstaller.Designer.vb
rename to Services.CommunicationService/ProjectInstaller.Designer.vb
diff --git a/DDEmailService/ProjectInstaller.resx b/Services.CommunicationService/ProjectInstaller.resx
similarity index 100%
rename from DDEmailService/ProjectInstaller.resx
rename to Services.CommunicationService/ProjectInstaller.resx
diff --git a/DDEmailService/ProjectInstaller.vb b/Services.CommunicationService/ProjectInstaller.vb
similarity index 100%
rename from DDEmailService/ProjectInstaller.vb
rename to Services.CommunicationService/ProjectInstaller.vb
diff --git a/DD_CommunicationService/clsEncryption.vb b/Services.CommunicationService/clsEncryption.vb
similarity index 100%
rename from DD_CommunicationService/clsEncryption.vb
rename to Services.CommunicationService/clsEncryption.vb
diff --git a/DDEmailService/App.config b/Services.EmailService/App.config
similarity index 100%
rename from DDEmailService/App.config
rename to Services.EmailService/App.config
diff --git a/DDEmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj
similarity index 100%
rename from DDEmailService/DDEmailService.vbproj
rename to Services.EmailService/DDEmailService.vbproj
diff --git a/DDEmailService/EmailService.Designer.vb b/Services.EmailService/EmailService.Designer.vb
similarity index 100%
rename from DDEmailService/EmailService.Designer.vb
rename to Services.EmailService/EmailService.Designer.vb
diff --git a/DDEmailService/EmailService.vb b/Services.EmailService/EmailService.vb
similarity index 100%
rename from DDEmailService/EmailService.vb
rename to Services.EmailService/EmailService.vb
diff --git a/DDZUGFeRDService/My Project/Application.Designer.vb b/Services.EmailService/My Project/Application.Designer.vb
similarity index 100%
rename from DDZUGFeRDService/My Project/Application.Designer.vb
rename to Services.EmailService/My Project/Application.Designer.vb
diff --git a/DDZUGFeRDService/My Project/Application.myapp b/Services.EmailService/My Project/Application.myapp
similarity index 100%
rename from DDZUGFeRDService/My Project/Application.myapp
rename to Services.EmailService/My Project/Application.myapp
diff --git a/DDEmailService/My Project/AssemblyInfo.vb b/Services.EmailService/My Project/AssemblyInfo.vb
similarity index 100%
rename from DDEmailService/My Project/AssemblyInfo.vb
rename to Services.EmailService/My Project/AssemblyInfo.vb
diff --git a/DDEmailService/My Project/Resources.Designer.vb b/Services.EmailService/My Project/Resources.Designer.vb
similarity index 100%
rename from DDEmailService/My Project/Resources.Designer.vb
rename to Services.EmailService/My Project/Resources.Designer.vb
diff --git a/DDZUGFeRDService/My Project/Resources.resx b/Services.EmailService/My Project/Resources.resx
similarity index 100%
rename from DDZUGFeRDService/My Project/Resources.resx
rename to Services.EmailService/My Project/Resources.resx
diff --git a/DDEmailService/My Project/Settings.Designer.vb b/Services.EmailService/My Project/Settings.Designer.vb
similarity index 100%
rename from DDEmailService/My Project/Settings.Designer.vb
rename to Services.EmailService/My Project/Settings.Designer.vb
diff --git a/DDEmailService/My Project/Settings.settings b/Services.EmailService/My Project/Settings.settings
similarity index 100%
rename from DDEmailService/My Project/Settings.settings
rename to Services.EmailService/My Project/Settings.settings
diff --git a/DDEmailService/ProjectInstaller.Designer.vb b/Services.EmailService/ProjectInstaller.Designer.vb
similarity index 100%
rename from DDEmailService/ProjectInstaller.Designer.vb
rename to Services.EmailService/ProjectInstaller.Designer.vb
diff --git a/DD_CommunicationService/ProjectInstaller.resx b/Services.EmailService/ProjectInstaller.resx
similarity index 100%
rename from DD_CommunicationService/ProjectInstaller.resx
rename to Services.EmailService/ProjectInstaller.resx
diff --git a/DD_CommunicationService/ProjectInstaller.vb b/Services.EmailService/ProjectInstaller.vb
similarity index 100%
rename from DD_CommunicationService/ProjectInstaller.vb
rename to Services.EmailService/ProjectInstaller.vb
diff --git a/DDEmailService/packages.config b/Services.EmailService/packages.config
similarity index 100%
rename from DDEmailService/packages.config
rename to Services.EmailService/packages.config
diff --git a/DDLicenseService/app.config b/Services.LicenseService/App.config
similarity index 100%
rename from DDLicenseService/app.config
rename to Services.LicenseService/App.config
diff --git a/DDLicenseService/AppConfig.vb b/Services.LicenseService/AppConfig.vb
similarity index 100%
rename from DDLicenseService/AppConfig.vb
rename to Services.LicenseService/AppConfig.vb
diff --git a/DDLicenseService/DDEDMLicenseService.vbproj b/Services.LicenseService/DDEDMLicenseService.vbproj
similarity index 100%
rename from DDLicenseService/DDEDMLicenseService.vbproj
rename to Services.LicenseService/DDEDMLicenseService.vbproj
diff --git a/DDLicenseService/ILicenseService.vb b/Services.LicenseService/ILicenseService.vb
similarity index 100%
rename from DDLicenseService/ILicenseService.vb
rename to Services.LicenseService/ILicenseService.vb
diff --git a/DDLicenseService/LicenseService.vb b/Services.LicenseService/LicenseService.vb
similarity index 100%
rename from DDLicenseService/LicenseService.vb
rename to Services.LicenseService/LicenseService.vb
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Application.Designer.vb b/Services.LicenseService/My Project/Application.Designer.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Application.Designer.vb
rename to Services.LicenseService/My Project/Application.Designer.vb
diff --git a/DDLicenseService/My Project/Application.myapp b/Services.LicenseService/My Project/Application.myapp
similarity index 100%
rename from DDLicenseService/My Project/Application.myapp
rename to Services.LicenseService/My Project/Application.myapp
diff --git a/DDLicenseService/My Project/AssemblyInfo.vb b/Services.LicenseService/My Project/AssemblyInfo.vb
similarity index 100%
rename from DDLicenseService/My Project/AssemblyInfo.vb
rename to Services.LicenseService/My Project/AssemblyInfo.vb
diff --git a/DDLicenseService/My Project/Resources.Designer.vb b/Services.LicenseService/My Project/Resources.Designer.vb
similarity index 100%
rename from DDLicenseService/My Project/Resources.Designer.vb
rename to Services.LicenseService/My Project/Resources.Designer.vb
diff --git a/DD_CommunicationService/My Project/Resources.resx b/Services.LicenseService/My Project/Resources.resx
similarity index 100%
rename from DD_CommunicationService/My Project/Resources.resx
rename to Services.LicenseService/My Project/Resources.resx
diff --git a/DDLicenseService/My Project/Settings.Designer.vb b/Services.LicenseService/My Project/Settings.Designer.vb
similarity index 100%
rename from DDLicenseService/My Project/Settings.Designer.vb
rename to Services.LicenseService/My Project/Settings.Designer.vb
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Settings.settings b/Services.LicenseService/My Project/Settings.settings
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Settings.settings
rename to Services.LicenseService/My Project/Settings.settings
diff --git a/SERVICES/DDEDM_NetworkService/ProjectInstaller.vb b/Services.LicenseService/ProjectInstaller.vb
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/ProjectInstaller.vb
rename to Services.LicenseService/ProjectInstaller.vb
diff --git a/DDLicenseService/Session.vb b/Services.LicenseService/Session.vb
similarity index 100%
rename from DDLicenseService/Session.vb
rename to Services.LicenseService/Session.vb
diff --git a/DDLicenseService/SettingsModule.vb b/Services.LicenseService/SettingsModule.vb
similarity index 100%
rename from DDLicenseService/SettingsModule.vb
rename to Services.LicenseService/SettingsModule.vb
diff --git a/DDLicenseService/WindowsService.vb b/Services.LicenseService/WindowsService.vb
similarity index 100%
rename from DDLicenseService/WindowsService.vb
rename to Services.LicenseService/WindowsService.vb
diff --git a/DDLicenseService/packages.config b/Services.LicenseService/packages.config
similarity index 100%
rename from DDLicenseService/packages.config
rename to Services.LicenseService/packages.config
diff --git a/DDZUGFeRDService/App.config b/Services.ZUGFeRDService/App.config
similarity index 100%
rename from DDZUGFeRDService/App.config
rename to Services.ZUGFeRDService/App.config
diff --git a/DDZUGFeRDService/DDZUGFeRDService.vbproj b/Services.ZUGFeRDService/DDZUGFeRDService.vbproj
similarity index 100%
rename from DDZUGFeRDService/DDZUGFeRDService.vbproj
rename to Services.ZUGFeRDService/DDZUGFeRDService.vbproj
diff --git a/DD_CommunicationService/My Project/Application.Designer.vb b/Services.ZUGFeRDService/My Project/Application.Designer.vb
similarity index 100%
rename from DD_CommunicationService/My Project/Application.Designer.vb
rename to Services.ZUGFeRDService/My Project/Application.Designer.vb
diff --git a/DD_CommunicationService/My Project/Application.myapp b/Services.ZUGFeRDService/My Project/Application.myapp
similarity index 100%
rename from DD_CommunicationService/My Project/Application.myapp
rename to Services.ZUGFeRDService/My Project/Application.myapp
diff --git a/DDZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb
similarity index 100%
rename from DDZUGFeRDService/My Project/AssemblyInfo.vb
rename to Services.ZUGFeRDService/My Project/AssemblyInfo.vb
diff --git a/DDZUGFeRDService/My Project/Resources.Designer.vb b/Services.ZUGFeRDService/My Project/Resources.Designer.vb
similarity index 100%
rename from DDZUGFeRDService/My Project/Resources.Designer.vb
rename to Services.ZUGFeRDService/My Project/Resources.Designer.vb
diff --git a/SERVICES/DDEDM_NetworkService/My Project/Resources.resx b/Services.ZUGFeRDService/My Project/Resources.resx
similarity index 100%
rename from SERVICES/DDEDM_NetworkService/My Project/Resources.resx
rename to Services.ZUGFeRDService/My Project/Resources.resx
diff --git a/DDZUGFeRDService/My Project/Settings.Designer.vb b/Services.ZUGFeRDService/My Project/Settings.Designer.vb
similarity index 100%
rename from DDZUGFeRDService/My Project/Settings.Designer.vb
rename to Services.ZUGFeRDService/My Project/Settings.Designer.vb
diff --git a/DDZUGFeRDService/My Project/Settings.settings b/Services.ZUGFeRDService/My Project/Settings.settings
similarity index 100%
rename from DDZUGFeRDService/My Project/Settings.settings
rename to Services.ZUGFeRDService/My Project/Settings.settings
diff --git a/DDZUGFeRDService/ProjectInstaller.vb b/Services.ZUGFeRDService/ProjectInstaller.vb
similarity index 100%
rename from DDZUGFeRDService/ProjectInstaller.vb
rename to Services.ZUGFeRDService/ProjectInstaller.vb
diff --git a/DDZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb
similarity index 100%
rename from DDZUGFeRDService/ThreadRunner.vb
rename to Services.ZUGFeRDService/ThreadRunner.vb
diff --git a/DDZUGFeRDService/ZUGFeRDService.Designer.vb b/Services.ZUGFeRDService/ZUGFeRDService.Designer.vb
similarity index 100%
rename from DDZUGFeRDService/ZUGFeRDService.Designer.vb
rename to Services.ZUGFeRDService/ZUGFeRDService.Designer.vb
diff --git a/DDZUGFeRDService/ZUGFeRDService.resx b/Services.ZUGFeRDService/ZUGFeRDService.resx
similarity index 100%
rename from DDZUGFeRDService/ZUGFeRDService.resx
rename to Services.ZUGFeRDService/ZUGFeRDService.resx
diff --git a/DDZUGFeRDService/ZUGFeRDService.vb b/Services.ZUGFeRDService/ZUGFeRDService.vb
similarity index 100%
rename from DDZUGFeRDService/ZUGFeRDService.vb
rename to Services.ZUGFeRDService/ZUGFeRDService.vb
diff --git a/DDZUGFeRDService/packages.config b/Services.ZUGFeRDService/packages.config
similarity index 100%
rename from DDZUGFeRDService/packages.config
rename to Services.ZUGFeRDService/packages.config