Revert "Restructure and project file organization"

This reverts commit 0edc1deed0.

AndroidSideloader.csproj

@@ -181,70 +181,70 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ADB.cs" />
-    <Compile Include="Controls\RoundButton.cs">
+    <Compile Include="RoundButton.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="ColumnSort.cs" />
     <Compile Include="Donors.cs" />
-    <Compile Include="Forms\DonorsListView.cs">
+    <Compile Include="DonorsListView.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\DonorsListView.Designer.cs">
+    <Compile Include="DonorsListView.Designer.cs">
       <DependentUpon>DonorsListView.cs</DependentUpon>
     </Compile>
     <Compile Include="FlexibleMessageBox.cs" />
-    <Compile Include="Controls\RoundedRectangleF.cs" />
+    <Compile Include="RoundedRectangleF.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Sideloader\GetDependencies.cs" />
-    <Compile Include="Forms\Splash.cs">
+    <Compile Include="Splash.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Splash.Designer.cs">
+    <Compile Include="Splash.Designer.cs">
       <DependentUpon>Splash.cs</DependentUpon>
     </Compile>
     <Compile Include="Models\PublicConfig.cs" />
-    <Compile Include="Forms\NewApps.cs">
+    <Compile Include="NewApps.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\NewApps.Designer.cs">
+    <Compile Include="NewApps.Designer.cs">
       <DependentUpon>NewApps.cs</DependentUpon>
     </Compile>
     <Compile Include="Transparenter.cs" />
-    <Compile Include="Forms\UpdateForm.cs">
+    <Compile Include="UpdateForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\UpdateForm.Designer.cs">
+    <Compile Include="UpdateForm.Designer.cs">
       <DependentUpon>UpdateForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\MainForm.cs">
+    <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\MainForm.Designer.cs">
+    <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Sideloader\ProcessOutput.cs" />
     <Compile Include="Sideloader\RCLONE.cs" />
     <Compile Include="Sideloader\Utilities.cs" />
     <Compile Include="Utilities\Logger.cs" />
-    <Compile Include="Forms\QuestForm.cs">
+    <Compile Include="QuestForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\QuestForm.Designer.cs">
+    <Compile Include="QuestForm.Designer.cs">
       <DependentUpon>QuestForm.cs</DependentUpon>
     </Compile>
     <Compile Include="RCLONE.cs" />
-    <Compile Include="Forms\SettingsForm.cs">
+    <Compile Include="SettingsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\SettingsForm.Designer.cs">
+    <Compile Include="SettingsForm.Designer.cs">
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Sideloader.cs" />
     <Compile Include="Updater.cs" />
-    <Compile Include="Forms\UsernameForm.cs">
+    <Compile Include="UsernameForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\UsernameForm.Designer.cs">
+    <Compile Include="UsernameForm.Designer.cs">
       <DependentUpon>UsernameForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
@@ -257,19 +257,19 @@
     <Compile Include="Utilities\UploadGame.cs" />
     <Compile Include="Utilities\Zip.cs" />
     <Compile Include="Utilities\Metrics.cs" />
-    <EmbeddedResource Include="Forms\DonorsListView.resx">
+    <EmbeddedResource Include="DonorsListView.resx">
       <DependentUpon>DonorsListView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Splash.resx">
+    <EmbeddedResource Include="Splash.resx">
       <DependentUpon>Splash.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\NewApps.resx">
+    <EmbeddedResource Include="NewApps.resx">
       <DependentUpon>NewApps.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\UpdateForm.resx">
+    <EmbeddedResource Include="UpdateForm.resx">
       <DependentUpon>UpdateForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\MainForm.resx">
+    <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -283,19 +283,19 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="Forms\QuestForm.resx">
+    <EmbeddedResource Include="QuestForm.resx">
       <DependentUpon>QuestForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\SettingsForm.resx">
+    <EmbeddedResource Include="SettingsForm.resx">
       <DependentUpon>SettingsForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\UsernameForm.resx">
+    <EmbeddedResource Include="UsernameForm.resx">
       <DependentUpon>UsernameForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <None Include="../codenames" />
+    <None Include="codenames" />
     <None Include="packages.config" />
     <None Include="Properties\DataSources\AndroidSideloader.Properties.Resources.datasource" />
     <None Include="Properties\DataSources\AndroidSideloader.Properties.Settings.datasource" />
@@ -308,29 +308,24 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <None Include="../Rookie Offline.cmd">
+    <None Include="Rookie Offline.cmd">
-      <Link>Rookie Offline.cmd</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="../CleanupInstall.cmd">
+    <None Include="CleanupInstall.cmd">
-      <Link>CleanupInstall.cmd</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="../AddDefenderExceptions.ps1">
+    <None Include="AddDefenderExceptions.ps1">
-      <Link>AddDefenderExceptions.ps1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="../version" />
+    <None Include="version" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="../changelog.txt">
+    <Content Include="changelog.txt" />
-      <Link>changelog.txt</Link>
-    </Content>
-    <Content Include="../ChangelogHistory.txt" />
     <Content Include="icon.ico" />
+    <Content Include="ChangelogHistory.txt" />
     <Content Include="Resources\pattern_cubes.png" />
     <Content Include="Resources\pattern_herringbone.png" />
     <Content Include="Resources\splashimage.png" />

AndroidSideloader.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSideloader", "Rookie/AndroidSideloader.csproj", "{CC8BE9F0-CE07-406A-A378-81D9CFE4CC1D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidSideloader", "AndroidSideloader.csproj", "{CC8BE9F0-CE07-406A-A378-81D9CFE4CC1D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9E3C926E-5E5F-4F97-AC52-060B14DDB055}"
 	ProjectSection(SolutionItems) = preProject