diff --git a/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj b/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
index 2da0d300..c944cd1e 100644
--- a/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
+++ b/AIS/bsmd.AIS2Service/bsmd.AIS2Service.csproj
@@ -94,25 +94,25 @@
       <DependentUpon>AIS2_Service.cs</DependentUpon>
     </Compile>
     <Compile Include="AISClass.cs" />
-    <Compile Include="AISController.cs" />
-    <Compile Include="AISDecoder.cs" />
+    <Compile Include="webservice\AISController.cs" />
+    <Compile Include="decoding\AISDecoder.cs" />
     <Compile Include="AISManager.cs" />
     <Compile Include="AISZoneMonitor.cs" />
-    <Compile Include="AIS_BaseStation.cs" />
-    <Compile Include="AIS_BaseStationReport.cs" />
-    <Compile Include="AIS_ClassB.cs" />
-    <Compile Include="AIS_ClassBExt.cs" />
-    <Compile Include="AIS_ClassBStatic.cs" />
-    <Compile Include="AIS_PosReport.cs" />
+    <Compile Include="decoding\AIS_BaseStation.cs" />
+    <Compile Include="decoding\AIS_BaseStationReport.cs" />
+    <Compile Include="decoding\AIS_ClassB.cs" />
+    <Compile Include="decoding\AIS_ClassBExt.cs" />
+    <Compile Include="decoding\AIS_ClassBStatic.cs" />
+    <Compile Include="decoding\AIS_PosReport.cs" />
     <Compile Include="AIS_SQLiteStorage.cs" />
-    <Compile Include="AIS_StaticData.cs" />
+    <Compile Include="decoding\AIS_StaticData.cs" />
     <Compile Include="AIS_Target.cs" />
     <Compile Include="IAISThread.cs" />
     <Compile Include="Lookup.cs" />
     <Compile Include="MonitorZone.cs" />
-    <Compile Include="NMEA.cs" />
-    <Compile Include="NMEA_AIS_Sentence.cs" />
-    <Compile Include="NMEA_PNMLS_Sentence.cs" />
+    <Compile Include="decoding\NMEA.cs" />
+    <Compile Include="decoding\NMEA_AIS_Sentence.cs" />
+    <Compile Include="decoding\NMEA_PNMLS_Sentence.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="ProjectInstaller.cs">
       <SubType>Component</SubType>
@@ -129,10 +129,10 @@
     <Compile Include="SerialTCPReader.cs" />
     <Compile Include="ShipLocationReport.cs" />
     <Compile Include="SitRep.cs" />
-    <Compile Include="SLRController.cs" />
-    <Compile Include="StartupWebAPI.cs" />
+    <Compile Include="webservice\SLRController.cs" />
+    <Compile Include="webservice\StartupWebAPI.cs" />
     <Compile Include="Util.cs" />
-    <Compile Include="ZonesController.cs" />
+    <Compile Include="webservice\ZonesController.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\SQL\ais_initial.db">
diff --git a/AIS/bsmd.AIS2Service/AISDecoder.cs b/AIS/bsmd.AIS2Service/decoding/AISDecoder.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AISDecoder.cs
rename to AIS/bsmd.AIS2Service/decoding/AISDecoder.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_BaseStation.cs b/AIS/bsmd.AIS2Service/decoding/AIS_BaseStation.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_BaseStation.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_BaseStation.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_BaseStationReport.cs b/AIS/bsmd.AIS2Service/decoding/AIS_BaseStationReport.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_BaseStationReport.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_BaseStationReport.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_ClassB.cs b/AIS/bsmd.AIS2Service/decoding/AIS_ClassB.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_ClassB.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_ClassB.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_ClassBExt.cs b/AIS/bsmd.AIS2Service/decoding/AIS_ClassBExt.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_ClassBExt.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_ClassBExt.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_ClassBStatic.cs b/AIS/bsmd.AIS2Service/decoding/AIS_ClassBStatic.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_ClassBStatic.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_ClassBStatic.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_PosReport.cs b/AIS/bsmd.AIS2Service/decoding/AIS_PosReport.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_PosReport.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_PosReport.cs
diff --git a/AIS/bsmd.AIS2Service/AIS_StaticData.cs b/AIS/bsmd.AIS2Service/decoding/AIS_StaticData.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AIS_StaticData.cs
rename to AIS/bsmd.AIS2Service/decoding/AIS_StaticData.cs
diff --git a/AIS/bsmd.AIS2Service/NMEA.cs b/AIS/bsmd.AIS2Service/decoding/NMEA.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/NMEA.cs
rename to AIS/bsmd.AIS2Service/decoding/NMEA.cs
diff --git a/AIS/bsmd.AIS2Service/NMEA_AIS_Sentence.cs b/AIS/bsmd.AIS2Service/decoding/NMEA_AIS_Sentence.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/NMEA_AIS_Sentence.cs
rename to AIS/bsmd.AIS2Service/decoding/NMEA_AIS_Sentence.cs
diff --git a/AIS/bsmd.AIS2Service/NMEA_PNMLS_Sentence.cs b/AIS/bsmd.AIS2Service/decoding/NMEA_PNMLS_Sentence.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/NMEA_PNMLS_Sentence.cs
rename to AIS/bsmd.AIS2Service/decoding/NMEA_PNMLS_Sentence.cs
diff --git a/AIS/bsmd.AIS2Service/AISController.cs b/AIS/bsmd.AIS2Service/webservice/AISController.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/AISController.cs
rename to AIS/bsmd.AIS2Service/webservice/AISController.cs
diff --git a/AIS/bsmd.AIS2Service/SLRController.cs b/AIS/bsmd.AIS2Service/webservice/SLRController.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/SLRController.cs
rename to AIS/bsmd.AIS2Service/webservice/SLRController.cs
diff --git a/AIS/bsmd.AIS2Service/StartupWebAPI.cs b/AIS/bsmd.AIS2Service/webservice/StartupWebAPI.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/StartupWebAPI.cs
rename to AIS/bsmd.AIS2Service/webservice/StartupWebAPI.cs
diff --git a/AIS/bsmd.AIS2Service/ZonesController.cs b/AIS/bsmd.AIS2Service/webservice/ZonesController.cs
similarity index 100%
rename from AIS/bsmd.AIS2Service/ZonesController.cs
rename to AIS/bsmd.AIS2Service/webservice/ZonesController.cs