diff --git a/.gitignore b/.gitignore
index 97db8301..1ca9059b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+.vs/
 [Dd]ebug/
\ No newline at end of file
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
deleted file mode 100644
index 38c5f003..00000000
--- a/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "CurrentProjectSetting": "x86-Debug"
-}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 6b611411..00000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
deleted file mode 100644
index d09d9b6a..00000000
Binary files a/.vs/slnx.sqlite and /dev/null differ
diff --git a/Code/Arduino/HanReader/HanReader.vcxitems b/Code/Arduino/HanReader/HanReader.vcxitems
index 8f11f984..0bffa575 100644
--- a/Code/Arduino/HanReader/HanReader.vcxitems
+++ b/Code/Arduino/HanReader/HanReader.vcxitems
@@ -14,16 +14,17 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)keywords.txt" />
     <Text Include="$(MSBuildThisFileDirectory)readme.txt" />
     <Text Include="$(MSBuildThisFileDirectory)library.properties" />
   </ItemGroup>
   <ItemGroup>
     <!-- <ClInclude Include="$(MSBuildThisFileDirectory)HanReader.h" /> -->
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\KamstrupTest\Kamstrup.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)src\Crc16.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)src\DlmsReader.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)src\HanReader.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)src\Kaifa.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)src\Kamstrup.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)src\Crc16.cpp" />
diff --git a/Code/Arduino/HanReader/HanReader.vcxitems.filters b/Code/Arduino/HanReader/HanReader.vcxitems.filters
index a2897a11..16a3ef5a 100644
--- a/Code/Arduino/HanReader/HanReader.vcxitems.filters
+++ b/Code/Arduino/HanReader/HanReader.vcxitems.filters
@@ -24,6 +24,7 @@
   <ItemGroup>
     <Text Include="$(MSBuildThisFileDirectory)readme.txt" />
     <Text Include="$(MSBuildThisFileDirectory)library.properties" />
+    <Text Include="$(MSBuildThisFileDirectory)keywords.txt" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Crc16.h">
@@ -35,10 +36,10 @@
     <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\HanReader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\..\KamstrupTest\Kamstrup.h">
+    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Kaifa.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Kaifa.h">
+    <ClInclude Include="C:\Users\roarf\OneDrive\Documents\GitHub\AmsToMqttBridge\Code\Arduino\HanReader\src\Kamstrup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/.suo b/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/.suo
deleted file mode 100644
index 00f88cd8..00000000
Binary files a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/.suo and /dev/null differ
diff --git a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db b/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db
deleted file mode 100644
index 1b2a3632..00000000
Binary files a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db and /dev/null differ
diff --git a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-shm b/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-shm
deleted file mode 100644
index d75da59d..00000000
Binary files a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-shm and /dev/null differ
diff --git a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-wal b/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-wal
deleted file mode 100644
index b0f88779..00000000
Binary files a/Code/Arduino/KamstrupTest/.vs/KamstrupTest/v15/Solution.VC.db-wal and /dev/null differ