Index: Core/Common/test/Core.Common.DelftTools.Tests/Core.Common.DelftTools.Tests.csproj
===================================================================
diff -u -r1c526b820be6d88285ac58ff819944b208966f39 -rad969acb75e4dcb265eba1c980852af81663c153
--- Core/Common/test/Core.Common.DelftTools.Tests/Core.Common.DelftTools.Tests.csproj	(.../Core.Common.DelftTools.Tests.csproj)	(revision 1c526b820be6d88285ac58ff819944b208966f39)
+++ Core/Common/test/Core.Common.DelftTools.Tests/Core.Common.DelftTools.Tests.csproj	(.../Core.Common.DelftTools.Tests.csproj)	(revision ad969acb75e4dcb265eba1c980852af81663c153)
@@ -54,34 +54,34 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Data.v9.3">
-      <HintPath>..\..\..\lib\DevExpress.Data.v9.3.dll</HintPath>
+      <HintPath>..\..\..\..\lib\DevExpress.Data.v9.3.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Utils.v9.3">
-      <HintPath>..\..\..\lib\DevExpress.Utils.v9.3.dll</HintPath>
+      <HintPath>..\..\..\..\lib\DevExpress.Utils.v9.3.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v9.3">
-      <HintPath>..\..\..\lib\DevExpress.XtraEditors.v9.3.dll</HintPath>
+      <HintPath>..\..\..\..\lib\DevExpress.XtraEditors.v9.3.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.XtraGrid.v9.3">
-      <HintPath>..\..\..\lib\DevExpress.XtraGrid.v9.3.dll</HintPath>
+      <HintPath>..\..\..\..\lib\DevExpress.XtraGrid.v9.3.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\log4net.dll</HintPath>
+      <HintPath>..\..\..\..\lib\log4net.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="PostSharp">
-      <HintPath>..\..\..\packages\PostSharp.2.1.7.28\lib\net20\PostSharp.dll</HintPath>
+      <HintPath>..\..\..\..\packages\PostSharp.2.1.7.28\lib\net20\PostSharp.dll</HintPath>
     </Reference>
     <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\Rhino.Mocks.dll</HintPath>
+      <HintPath>..\..\..\..\lib\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="SharpTestsEx">
-      <HintPath>..\..\..\lib\SharpTestsEx.dll</HintPath>
+      <HintPath>..\..\..\..\lib\SharpTestsEx.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Activities" />
@@ -158,47 +158,47 @@
     <Compile Include="TestUtils\WindowsFormsTestHelperTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Core.Common.Gui\Core.Common.Gui.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.Gui\Core.Common.Gui.csproj">
       <Project>{30E4C2AE-719E-4D70-9FA9-668A9767FBFA}</Project>
       <Name>Core.Common.Gui</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\GIS\src\Core.GIS.GeoApi.Extensions\Core.GIS.GeoApi.Extensions.csproj">
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI.Extensions\Core.GIS.GeoAPI.Extensions.csproj">
       <Project>{016DBD27-99BF-489A-81B5-50D66964BB90}</Project>
       <Name>Core.GIS.GeoApi.Extensions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\..\GIS\src\Core.GIS.GeoApi\Core.GIS.GeoApi.csproj">
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.GeoAPI\Core.GIS.GeoAPI.csproj">
       <Project>{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A}</Project>
       <Name>Core.GIS.GeoApi</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.Controls.Swf\Core.Common.Controls.Swf.csproj">
       <Project>{3DBD23CE-5C4A-4A49-B51C-B268CB2B510E}</Project>
       <Name>Core.Common.Controls.Swf</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Core.Common.BaseDelftTools\Core.Common.BaseDelftTools.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.BaseDelftTools\Core.Common.BaseDelftTools.csproj">
       <Project>{82B61D20-FD4B-49BE-9252-5BF6E3EE4666}</Project>
       <Name>Core.Common.BaseDelftTools</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.Common.Gui.Swf\Core.Common.Gui.Swf.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.Gui.Swf\Core.Common.Gui.Swf.csproj">
       <Project>{08205620-D756-4533-922C-D6A4C0038535}</Project>
       <Name>Core.Common.Gui.Swf</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap.Api\Core.GIS.SharpMap.Api.csproj">
       <Project>{A3C9DF74-978A-44B1-B55D-A72AC4221E3A}</Project>
       <Name>SharpMap.Api</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\SharpMap\SharpMap.csproj">
+    <ProjectReference Include="..\..\..\GIS\src\Core.GIS.SharpMap\Core.GIS.SharpMap.csproj">
       <Project>{C83777FC-AABB-47D9-911F-D76255D4D541}</Project>
       <Name>SharpMap</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
+    <ProjectReference Include="..\..\test\Core.Common.TestUtils\Core.Common.TestUtils.csproj">
       <Project>{EFA25023-CF6A-4FF7-8C42-B24D7F9509E1}</Project>
       <Name>Core.Common.TestUtils</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Core.Common.Utils\Core.Common.Utils.csproj">
+    <ProjectReference Include="..\..\src\Core.Common.Utils\Core.Common.Utils.csproj">
       <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
       <Name>Core.Common.Utils</Name>
     </ProjectReference>
Index: DeltaShell.sln
===================================================================
diff -u -r1c526b820be6d88285ac58ff819944b208966f39 -rad969acb75e4dcb265eba1c980852af81663c153
--- DeltaShell.sln	(.../DeltaShell.sln)	(revision 1c526b820be6d88285ac58ff819944b208966f39)
+++ DeltaShell.sln	(.../DeltaShell.sln)	(revision ad969acb75e4dcb265eba1c980852af81663c153)
@@ -146,6 +146,10 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.Tests", "Core\Common\test\Core.Common.Tests\Core.Common.Tests.csproj", "{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.UML", "Ringtoets\Piping\uml\Ringtoets.Piping.UML\Ringtoets.Piping.UML.csproj", "{4AD99020-8612-46E5-A313-F9ADA7B196E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Common.DelftTools.Tests", "Core\Common\test\Core.Common.DelftTools.Tests\Core.Common.DelftTools.Tests.csproj", "{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CreateInstaller|x86 = CreateInstaller|x86
@@ -447,6 +451,18 @@
 		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Debug|x86.Build.0 = Debug|x86
 		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Release|x86.ActiveCfg = Release|x86
 		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B}.Release|x86.Build.0 = Release|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.CreateInstaller|x86.Build.0 = Release|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.Debug|x86.ActiveCfg = Debug|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.Debug|x86.Build.0 = Debug|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.Release|x86.ActiveCfg = Release|x86
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4}.Release|x86.Build.0 = Release|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.CreateInstaller|x86.Build.0 = Release|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.Debug|x86.ActiveCfg = Debug|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.Debug|x86.Build.0 = Debug|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.Release|x86.ActiveCfg = Release|x86
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -478,6 +494,7 @@
 		{7F937E31-02CA-41D9-B7D4-1079CF452C72} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{D749EE4C-CE50-4C17-BF01-9A953028C126} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{E0990383-FB2E-47D1-99CD-9B9FA2929E5B} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
+		{FAFDB463-9612-41F4-B3DD-FF9C6E7023BA} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{FFB69466-79DE-466A-ADA7-5C47C5C5CA3A} = {C9F89C6E-CEA9-40CA-96A9-2A0368459B9F}
 		{016DBD27-99BF-489A-81B5-50D66964BB90} = {C9F89C6E-CEA9-40CA-96A9-2A0368459B9F}
 		{5770DAA9-84E5-4770-AF43-F6B815894368} = {C9F89C6E-CEA9-40CA-96A9-2A0368459B9F}
@@ -521,6 +538,7 @@
 		{E4B0E068-F1A3-47BA-965F-0EC1E78E530A} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{9A5C8069-520E-49D3-AA62-E8FB19614A27} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{D783543B-46A1-4848-A812-AF5A5259ED7E} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
+		{4AD99020-8612-46E5-A313-F9ADA7B196E4} = {492FFA2C-351E-48DB-BA51-B837657BAF2F}
 	EndGlobalSection
 	GlobalSection(TextTemplating) = postSolution
 		TextTemplating = 1