Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Application/Deltares.Dam.Application.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Application/Deltares.Dam.Application.csproj	(.../Deltares.Dam.Application.csproj)	(revision 1506)
@@ -121,8 +121,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
     <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam.sln
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam.sln	(.../Dam.sln)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam.sln	(.../Dam.sln)	(revision 1506)
@@ -32,16 +32,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LumenWorks.Framework.IO", "Tools\LumenWorks.Framework.IO\LumenWorks.Framework.IO.csproj", "{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "Dam\Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D4B66CA4-73D2-40CF-B3ED-9D473ABA34EE}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -84,11 +74,6 @@
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {E5FBE34E-740D-42AA-AD11-431A23EEF6CA}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CsvToDamxConverter", "Dam\Tools\CsvToDamxConverter\CsvToDamxConverter.csproj", "{D8457286-3BD4-49FB-9FCB-22D7CB662F57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeoXY2LatLong", "Dam\Tools\GeoXY2LatLong\GeoXY2LatLong.csproj", "{2C1BFE67-A106-4926-BA5A-0374EA6B99B6}"
@@ -102,6 +87,12 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Version", "Deltares.Dam.Version\Deltares.Dam.Version.csproj", "{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps", "DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj", "{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Dam.Data", "DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj", "{F1CD9620-15CF-41F8-AF70-5AE004A50F60}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deltares.Maps.Tests", "DamClientsLibrary\Deltares.Maps\Test\Deltares.Maps.Tests.csproj", "{E0820F33-3929-493D-821D-95E755F87D0B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -112,14 +103,6 @@
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Debug|x86.Build.0 = Debug|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.ActiveCfg = Release|x86
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C}.Release|x86.Build.0 = Release|x86
-		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86
-		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86
-		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86
-		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.Build.0 = Release|x86
-		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.ActiveCfg = Debug|x86
-		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86
-		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86
-		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.ActiveCfg = Debug|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Debug|x86.Build.0 = Debug|x86
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}.Release|x86.ActiveCfg = Release|x86
@@ -148,10 +131,6 @@
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Debug|x86.Build.0 = Debug|x86
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Release|x86.ActiveCfg = Release|x86
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4}.Release|x86.Build.0 = Release|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
-		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.ActiveCfg = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Debug|x86.Build.0 = Debug|x86
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57}.Release|x86.ActiveCfg = Release|x86
@@ -170,6 +149,18 @@
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Debug|x86.Build.0 = Debug|x86
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.ActiveCfg = Release|x86
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA}.Release|x86.Build.0 = Release|x86
+		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.ActiveCfg = Debug|x86
+		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Debug|x86.Build.0 = Debug|x86
+		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.ActiveCfg = Release|x86
+		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}.Release|x86.Build.0 = Release|x86
+		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.ActiveCfg = Debug|x86
+		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Debug|x86.Build.0 = Debug|x86
+		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.ActiveCfg = Release|x86
+		{F1CD9620-15CF-41F8-AF70-5AE004A50F60}.Release|x86.Build.0 = Release|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.ActiveCfg = Debug|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Debug|x86.Build.0 = Debug|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.ActiveCfg = Release|x86
+		{E0820F33-3929-493D-821D-95E755F87D0B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -180,20 +171,20 @@
 		{6708ED54-139D-4508-99B2-A3C27FA781FF} = {146FCBE0-C8C1-46CA-AF69-E8F67F179958}
 		{62CC2363-893F-4ECD-BCD6-AA7150AD6918} = {6A55AC8E-14F0-4F4E-94C6-602BE8B3B2C9}
 		{E3B83D68-C90C-4874-8E5F-DEC8D038BC7C} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770}
-		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770}
 		{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60} = {658575B9-AEBC-42C9-8ADA-D961449E00BC}
 		{03810024-8D4D-4726-9C4A-4A6886651CAB} = {95699CCD-37A6-4F2E-9462-F2F474AD8AE8}
 		{CF39BFD8-B4D7-4290-9223-F19D3E8E1058} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{3929C2AB-5F5B-40A1-8D77-6303AEE7976B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D092C06D-9CE6-48CF-8453-637FCCE8B371} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D312A703-F6CF-4BEC-B5C5-4E9C161D2010} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{15503BE5-7148-4DA6-BDD0-5880266E79D4} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
-		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{D8457286-3BD4-49FB-9FCB-22D7CB662F57} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{2C1BFE67-A106-4926-BA5A-0374EA6B99B6} = {21ABEBA9-040B-4522-BD23-837E4FB5CD08}
 		{5ACA0915-875D-4F5C-A5D1-7D6FE1E7B8CA} = {BE4E3A78-F55F-4DE7-BCA4-9BAB59C37549}
 		{9184EF77-E11F-41C9-8926-CFF0AABE43A0} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 		{E5FBE34E-740D-42AA-AD11-431A23EEF6CA} = {31A32A36-649A-41A8-9F43-6A6193C04770}
+		{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665} = {31A32A36-649A-41A8-9F43-6A6193C04770}
+		{F1CD9620-15CF-41F8-AF70-5AE004A50F60} = {31A32A36-649A-41A8-9F43-6A6193C04770}
+		{E0820F33-3929-493D-821D-95E755F87D0B} = {62CC2363-893F-4ECD-BCD6-AA7150AD6918}
 	EndGlobalSection
 EndGlobal
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/Deltares.Dam.Forms.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/Deltares.Dam.Forms.csproj	(.../Deltares.Dam.Forms.csproj)	(revision 1506)
@@ -331,7 +331,7 @@
     <None Include="Resources\pencil.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
       <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Specifications/Specifications/Deltares.Dam.Specifications.Tests.csproj	(.../Deltares.Dam.Specifications.Tests.csproj)	(revision 1506)
@@ -60,17 +60,17 @@
     <Compile Include="SpecifcationTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Dam\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
+      <Name>Deltares.Dam.Data</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.BenchmarkTests.csproj	(.../Deltares.Dam.BenchmarkTests.csproj)	(revision 1506)
@@ -104,8 +104,8 @@
     <Compile Include="DamPipingBenchmarkTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
     <ProjectReference Include="Deltares.Dam.IntegrationTests.csproj">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj
===================================================================
diff -u -r1505 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 1505)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj	(.../Deltares.Dam.Data.csproj)	(revision 1506)
@@ -446,7 +446,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Maps\Deltares.Maps.csproj">
+    <ProjectReference Include="..\Deltares.Maps\Deltares.Maps.csproj">
       <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
       <Name>Deltares.Maps</Name>
     </ProjectReference>
@@ -459,7 +459,7 @@
     <Folder Include="DtoAssembler\Properties\" />
     <Folder Include="MetaInfo\" />
   </ItemGroup>
-  <Import Project="$(ProjectDir)..\..\build\Deltares.Dam.Version.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/AssessmentCalculationSpecificationPropertyControl.cs
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/AssessmentCalculationSpecificationPropertyControl.cs	(.../AssessmentCalculationSpecificationPropertyControl.cs)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Forms/AssessmentCalculationSpecificationPropertyControl.cs	(.../AssessmentCalculationSpecificationPropertyControl.cs)	(revision 1506)
@@ -19,16 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using Deltares.Dam.Data;
-using Deltares.Standard;
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
 
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Deltares.Dam.DamWti.Tests.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Deltares.Dam.DamWti.Tests.csproj	(.../Deltares.Dam.DamWti.Tests.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/WTI/Deltares.Dam.DamWti.Tests/Deltares.Dam.DamWti.Tests.csproj	(.../Deltares.Dam.DamWti.Tests.csproj)	(revision 1506)
@@ -57,16 +57,16 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Data\Deltares.Dam.Data.csproj">
-      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
+      <Name>Deltares.Dam.Data</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Copying.GPL.licenseheader
===================================================================
diff -u
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Copying.GPL.licenseheader	(revision 0)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Copying.GPL.licenseheader	(revision 1506)
@@ -0,0 +1,45 @@
+extensions: .cs
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+extensions:  .xml .config .xsd .wxs
+<!--
+Copyright (C) Stichting Deltares 2018. All rights reserved.
+
+This file is part of the DAM - UI.
+
+The DAM - UI is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
\ No newline at end of file
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj
===================================================================
diff -u -r1504 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 1504)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/DamClientsLibrary/Deltares.Maps/Deltares.Maps.csproj	(.../Deltares.Maps.csproj)	(revision 1506)
@@ -82,7 +82,7 @@
   <ItemGroup>
     <Reference Include="Deltares.Standard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31fe100197c68040, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
+      <HintPath>..\..\..\lib\DSL-Core\Deltares.Standard.dll</HintPath>
     </Reference>
     <Reference Include="GeoAPI, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -139,7 +139,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Translations.xml" />
   </ItemGroup>
-  <Import Project="$(ProjectDir)..\build\Deltares.Dam.Version.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj	(.../CsvToDamxConverter.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj	(.../CsvToDamxConverter.csproj)	(revision 1506)
@@ -76,12 +76,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
@@ -126,6 +120,12 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
+      <Name>Deltares.Dam.Data</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/TestHelper/Deltares.Dam.TestHelper.csproj	(.../Deltares.Dam.TestHelper.csproj)	(revision 1506)
@@ -83,17 +83,21 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <None Include="..\..\..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
+      <Project>{f1cd9620-15cf-41f8-af70-5ae004a50f60}</Project>
+      <Name>Deltares.Dam.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj">
+      <Project>{17f76a8e-c9f4-415f-8d4b-0e8a3b36e665}</Project>
+      <Name>Deltares.Maps</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.IntegrationTests.csproj	(.../Deltares.Dam.IntegrationTests.csproj)	(revision 1506)
@@ -96,14 +96,10 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
       <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
-    </ProjectReference>
     <ProjectReference Include="TestHelper\Deltares.Dam.TestHelper.csproj">
       <Project>{d312a703-f6cf-4bec-b5c5-4e9c161d2010}</Project>
       <Name>Deltares.Dam.TestHelper</Name>
Index: DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.Tests.csproj
===================================================================
diff -u -r1499 -r1506
--- DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 1499)
+++ DamClients/DamUI/branches/RefactoringClientLibrary/src/Dam/Tests/Deltares.Dam.Tests.csproj	(.../Deltares.Dam.Tests.csproj)	(revision 1506)
@@ -200,17 +200,13 @@
     <Compile Include="UpliftFactorToBetaCalculatorTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Maps\Deltares.Maps.csproj">
-      <Project>{17F76A8E-C9F4-415F-8D4B-0E8A3B36E665}</Project>
-      <Name>Deltares.Maps</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Dam.Data\Deltares.Dam.Data.csproj">
       <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
       <Name>Deltares.Dam.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Data\Deltares.Dam.Data.csproj">
-      <Project>{F1CD9620-15CF-41F8-AF70-5AE004A50F60}</Project>
-      <Name>Deltares.Dam.Data</Name>
+    <ProjectReference Include="..\..\DamClientsLibrary\Deltares.Maps\Deltares.Maps.csproj">
+      <Project>{17f76a8e-c9f4-415f-8d4b-0e8a3b36e665}</Project>
+      <Name>Deltares.Maps</Name>
     </ProjectReference>
     <ProjectReference Include="..\Forms\Deltares.Dam.Forms.csproj">
       <Project>{1ECA25B3-E6B9-4910-91F0-4A49F9FFCF60}</Project>