diff --git a/GenesisCordonelInterface/GenesisCordonelInterface.csproj b/GenesisCordonelInterface/GenesisCordonelInterface.csproj
index d2549b097..262842e84 100644
--- a/GenesisCordonelInterface/GenesisCordonelInterface.csproj
+++ b/GenesisCordonelInterface/GenesisCordonelInterface.csproj
@@ -1,7 +1,7 @@
 <?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>
+<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>{C955D8AC-76B8-42D8-A83F-8AEB56CF2567}</ProjectGuid>
@@ -98,6 +98,12 @@
     <Compile Include="UI\LaatzenAPI_CordonelPreadjustmentUI\PreAdjustmentControl.Designer.cs">
       <DependentUpon>PreAdjustmentControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\MainView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UI\MainView.Designer.cs">
+      <DependentUpon>MainView.cs</DependentUpon>
+    </Compile>
     <Compile Include="UI\StaraTuraAPI_GenesisCordonelInterface\FrmGCIAPI.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -145,8 +151,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Core\AsTbfComponent\" />
-    <Folder Include="UI\AsTbfComponent\" />
+    <Folder Include="dll\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
@@ -222,24 +227,18 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-<Target Name="CopyBuiltXylemDependenciesToCommonPackages" AfterTargets="Build">
-  <PropertyGroup>
-    <CommonPackagesDir>$(ProjectDir)..\packages\Common\</CommonPackagesDir>
-  </PropertyGroup>
-
-  <MakeDir Directories="$(CommonPackagesDir)" />
-
-  <ItemGroup>
-    <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll" />
-    <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll" />
-    <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll" />
-    <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll" />
-    <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Metrology.Measurements.dll" />
-  </ItemGroup>
-
-  <Copy
-    SourceFiles="@(BuiltXylemDlls)"
-    DestinationFolder="$(CommonPackagesDir)"
-    SkipUnchangedFiles="false" />
-</Target>
+  <Target Name="CopyBuiltXylemDependenciesToCommonPackages" AfterTargets="Build">
+    <PropertyGroup>
+      <CommonPackagesDir>$(ProjectDir)..\packages\Common\</CommonPackagesDir>
+    </PropertyGroup>
+    <MakeDir Directories="$(CommonPackagesDir)" />
+    <ItemGroup>
+      <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig.dll" />
+      <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.dll" />
+      <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.WaterMeterCore.dll" />
+      <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Hardware.WaterMeter.WaterMeterRegisters.dll" />
+      <BuiltXylemDlls Include="$(TargetDir)Xylem.Common.Metrology.Measurements.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(BuiltXylemDlls)" DestinationFolder="$(CommonPackagesDir)" SkipUnchangedFiles="false" />
+  </Target>
 </Project>
\ No newline at end of file