diff --git a/AppleIISd.sln b/AppleIISd.sln
index 628970c..57f1e60 100644
--- a/AppleIISd.sln
+++ b/AppleIISd.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppleIISd", "AppleIISd.vcxproj", "{9EA7EC3D-1771-420F-932F-231A35ED1200}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppleIISd", "Firmware\AppleIISd.vcxproj", "{9EA7EC3D-1771-420F-932F-231A35ED1200}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AppleIISd.vcxproj b/Firmware/AppleIISd.vcxproj
similarity index 98%
rename from AppleIISd.vcxproj
rename to Firmware/AppleIISd.vcxproj
index f2250bb..3e11239 100644
--- a/AppleIISd.vcxproj
+++ b/Firmware/AppleIISd.vcxproj
@@ -11,9 +11,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\README.md" />
     <None Include="makefile" />
+    <None Include="Makefile.options" />
     <None Include="obj\AppleIISd.lst" />
-    <None Include="README.md" />
     <None Include="src\AppleIISd.cfg" />
     <None Include="src\AppleIISd.inc" />
     <None Include="src\AppleIISd.s" />
diff --git a/AppleIISd.vcxproj.filters b/Firmware/AppleIISd.vcxproj.filters
similarity index 90%
rename from AppleIISd.vcxproj.filters
rename to Firmware/AppleIISd.vcxproj.filters
index 061ceab..b7b8674 100644
--- a/AppleIISd.vcxproj.filters
+++ b/Firmware/AppleIISd.vcxproj.filters
@@ -8,7 +8,6 @@
     <None Include="src\AppleIISd.s">
       <Filter>src</Filter>
     </None>
-    <None Include="README.md" />
     <None Include="obj\AppleIISd.lst" />
     <None Include="src\Helper.s">
       <Filter>src</Filter>
@@ -22,6 +21,8 @@
     <None Include="src\Smartport.s">
       <Filter>src</Filter>
     </None>
+    <None Include="Makefile.options" />
+    <None Include="..\README.md" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
diff --git a/makefile b/Firmware/makefile
similarity index 100%
rename from makefile
rename to Firmware/makefile
diff --git a/src/AppleIISd.cfg b/Firmware/src/AppleIISd.cfg
similarity index 100%
rename from src/AppleIISd.cfg
rename to Firmware/src/AppleIISd.cfg
diff --git a/src/AppleIISd.inc b/Firmware/src/AppleIISd.inc
similarity index 100%
rename from src/AppleIISd.inc
rename to Firmware/src/AppleIISd.inc
diff --git a/src/AppleIISd.s b/Firmware/src/AppleIISd.s
similarity index 100%
rename from src/AppleIISd.s
rename to Firmware/src/AppleIISd.s
diff --git a/src/Helper.s b/Firmware/src/Helper.s
similarity index 100%
rename from src/Helper.s
rename to Firmware/src/Helper.s
diff --git a/src/ProDOS.s b/Firmware/src/ProDOS.s
similarity index 100%
rename from src/ProDOS.s
rename to Firmware/src/ProDOS.s
diff --git a/src/Smartport.s b/Firmware/src/Smartport.s
similarity index 100%
rename from src/Smartport.s
rename to Firmware/src/Smartport.s