diff --git a/SharpCAT.sln b/SharpCAT.sln
index 0ad3c97..1a8fca1 100644
--- a/SharpCAT.sln
+++ b/SharpCAT.sln
@@ -3,17 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.421
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{3C050B74-ACBA-427C-B3F4-069D6E23BD67}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Radios", "Radios", "{7D1D7F1D-8AC1-4309-BBFB-D8B12363A347}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Yaesu", "Yaesu", "{4B0F6F9A-A9EB-45D9-B70F-AD49D0C6AD5F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FT818", "FT818", "{9657A3C4-B6F9-4E2D-A65E-DAE55A6DBEF2}"
-	ProjectSection(SolutionItems) = preProject
-		SharpCAT\Docs\Radios\Yaesu\FT818\Yaesu-FT-818nd-manual-FT818.pdf = SharpCAT\Docs\Radios\Yaesu\FT818\Yaesu-FT-818nd-manual-FT818.pdf
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCATForms", "SharpCATForms\SharpCATForms.csproj", "{3483B368-338A-4BE3-AEB9-460E374B2C99}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpCAT", "SharpCAT\SharpCAT.csproj", "{DAD3E7BE-905A-4768-A695-0BCF96171E35}"
@@ -36,11 +25,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7D1D7F1D-8AC1-4309-BBFB-D8B12363A347} = {3C050B74-ACBA-427C-B3F4-069D6E23BD67}
-		{4B0F6F9A-A9EB-45D9-B70F-AD49D0C6AD5F} = {7D1D7F1D-8AC1-4309-BBFB-D8B12363A347}
-		{9657A3C4-B6F9-4E2D-A65E-DAE55A6DBEF2} = {4B0F6F9A-A9EB-45D9-B70F-AD49D0C6AD5F}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4BF99AE0-6109-48CE-955C-F4F31BA0D9BA}
 	EndGlobalSection
diff --git a/SharpCAT/CATCommand.cs b/SharpCAT/Models/CATCommand.cs
similarity index 100%
rename from SharpCAT/CATCommand.cs
rename to SharpCAT/Models/CATCommand.cs
diff --git a/SharpCAT/Yaesu FT818.cs b/SharpCAT/Models/Radios/Yaesu/FT818.cs
similarity index 100%
rename from SharpCAT/Yaesu FT818.cs
rename to SharpCAT/Models/Radios/Yaesu/FT818.cs
diff --git a/SharpCAT/SharpCAT.csproj b/SharpCAT/SharpCAT.csproj
index ef38117..2e1df67 100644
--- a/SharpCAT/SharpCAT.csproj
+++ b/SharpCAT/SharpCAT.csproj
@@ -17,4 +17,9 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Models\Radios\Icom\" />
+    <Folder Include="Models\Radios\Kenwood\" />
+  </ItemGroup>
+
 </Project>
diff --git a/SharpCATForms/SharpCATForms.csproj b/SharpCATForms/SharpCATForms.csproj
index df03c46..988b796 100644
--- a/SharpCATForms/SharpCATForms.csproj
+++ b/SharpCATForms/SharpCATForms.csproj
@@ -79,5 +79,11 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SharpCAT\SharpCAT.csproj">
+      <Project>{dad3e7be-905a-4768-a695-0bcf96171e35}</Project>
+      <Name>SharpCAT</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file