Reorganize (#11)

* Reorganize all files * Update workflows
edgegamers · Sep 8, 2024 · ee3f322 · ee3f322
1 parent 8e8185e
commit ee3f322
Show file tree

Hide file tree

Showing 127 changed files with 35 additions and 70 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,17 +15,13 @@ on:
   push:
     branches: [ "main", "dev" ]
     paths:
-      - 'Gangs*/**'
-      - '.github/workflows/nightly.yml'
-      - 'Core/**'
-      - 'Commands/**'
+      - 'src/**'
+      - '.github/workflows/codeql.yml'
   pull_request:
     branches: [ "main" ]
     paths:
-      - 'Gangs*/**'
-      - '.github/workflows/nightly.yml'
-      - 'Core/**'
-      - 'Commands/**'
+      - 'src/**'
+      - '.github/workflows/codeql.yml'
   schedule:
     - cron: '34 12 * * 6'
 

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -3,17 +3,13 @@ name: Build / Test
 on:
   push:
     paths:
-      - 'Gangs*/**'
+      - 'src/**'
       - '.github/workflows/dotnet.yml'
-      - 'Core/**'
-      - 'Commands/**'
       - 'coverage.runsettings'
   pull_request:
     paths:
-      - 'Gangs*/**'
+      - 'src/**'
       - '.github/workflows/dotnet.yml'
-      - 'Core/**'
-      - 'Commands/**'
       - 'coverage.runsettings'
 
 jobs:
@@ -84,16 +80,16 @@ jobs:
       - name: Test with MariaDB
         env:
           DB_GANGS_CONNECTION: "Server=localhost;Port=3307;Database=gangs;User=root"
-        run: dotnet test GangsTest/GangsTest.csproj --no-build --verbosity normal
+        run: dotnet test src/GangsTest/GangsTest.csproj --no-build --verbosity normal
       - name: Test with MySQL
         env:
           DB_GANGS_CONNECTION: "Server=localhost;Port=3306;Database=gangs;User=root"
-        run: dotnet test GangsTest/GangsTest.csproj --no-build --verbosity normal
+        run: dotnet test src/GangsTest/GangsTest.csproj --no-build --verbosity normal
       - name: Generate Code Coverage Report
         env:
           DB_GANGS_CONNECTION: "Server=localhost;Port=3306;Database=gangs;User=root"
         if: ${{ matrix.dotnet-version == '9.0.x' }}
-        run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage" --logger trx --results-directory coverage GangsTest/GangsTest.csproj --settings coverage.runsettings
+        run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage" --logger trx --results-directory coverage src/GangsTest/GangsTest.csproj --settings coverage.runsettings
       - name: Code Coverage Summary Report
         uses: irongut/[email protected]
         if: ${{ matrix.dotnet-version == '9.0.x' }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -5,9 +5,10 @@ name: Nightly
 
 on:
   workflow_run:
-    workflows: [ "Build / Test" ]
+    workflows: [ Build / Test ]
     branches: [ "dev", "main" ]
-    types: [ "completed" ]
+    types:
+      - completed
   push:
     branches:
       - dev
@@ -17,6 +18,7 @@ on:
 
 jobs:
   build:
+    if: github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -32,8 +34,8 @@ jobs:
 
       - run: |
           dotnet restore
-          dotnet build Gangs/Gangs.csproj --no-restore
-          dotnet publish Gangs/Gangs.csproj --no-build --no-restore
+          dotnet build src/CS2/Gangs/Gangs.csproj --no-restore
+          dotnet publish src/CS2/Gangs/Gangs.csproj --no-build --no-restore
 
       - uses: actions/[email protected]
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,8 +24,8 @@ jobs:
 
       - run: |
           dotnet restore
-          dotnet build Core/Core.csproj --no-restore
-          dotnet publish Core/Core.csproj --no-build --no-restore
+          dotnet build src/CS2/Gangs/Gangs.csproj --no-restore
+          dotnet publish src/CS2/Gangs/Gangs.csproj --no-build --no-restore
 
       - uses: actions/[email protected]
         with:

diff --git a/Gangs.sln b/Gangs.sln
@@ -1,26 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsAPI", "GangsAPI\GangsAPI.csproj", "{787D12D8-1310-4042-ADCE-102E517F269E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsAPI", "src\GangsAPI\GangsAPI.csproj", "{787D12D8-1310-4042-ADCE-102E517F269E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gangs", "Gangs\Gangs.csproj", "{3EA38296-9022-4874-8309-872388D884DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gangs", "src\CS2\Gangs\Gangs.csproj", "{3EA38296-9022-4874-8309-872388D884DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsTest", "GangsTest\GangsTest.csproj", "{B1D1E7C7-BDF3-4238-9025-4FEB2B7DAB89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsTest", "src\GangsTest\GangsTest.csproj", "{B1D1E7C7-BDF3-4238-9025-4FEB2B7DAB89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mock", "GangsImpl\Mock\Mock.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mock", "src\GangsImpl\Mock\Mock.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GangsImpl", "GangsImpl", "{3AB7703F-880F-4A41-96EE-B891FA888C65}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GangsImpl", "src\GangsImpl", "{3AB7703F-880F-4A41-96EE-B891FA888C65}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQL", "GangsImpl\MySQL\MySQL.csproj", "{1899055E-62B8-4907-85A2-DFE22531729E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySQL", "src\GangsImpl\MySQL\MySQL.csproj", "{1899055E-62B8-4907-85A2-DFE22531729E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractDB", "GangsImpl\AbstractDB\AbstractDB.csproj", "{74B15261-4B12-4EF6-859A-E46B315E7DD3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractDB", "src\GangsImpl\AbstractDB\AbstractDB.csproj", "{74B15261-4B12-4EF6-859A-E46B315E7DD3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite", "GangsImpl\SQLite\SQLite.csproj", "{5186EA9C-D2A4-4D70-8F52-0D6C7B6A61B6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLite", "src\GangsImpl\SQLite\SQLite.csproj", "{5186EA9C-D2A4-4D70-8F52-0D6C7B6A61B6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CS2", "CS2", "{AC07CD29-5C9D-4AD1-99C7-01DABAB8D0EC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "Commands\Commands.csproj", "{C7DF1D47-8D2B-4651-98AB-AEEBE5860ECA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "src\CS2\Commands\Commands.csproj", "{C7DF1D47-8D2B-4651-98AB-AEEBE5860ECA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "GangsImpl\Stats\Stats.csproj", "{BA8D993B-754E-4BB4-B103-482A4F779404}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "src\GangsImpl\Stats\Stats.csproj", "{BA8D993B-754E-4BB4-B103-482A4F779404}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SQL", "SQL", "{32D392D5-C809-45A1-A5FB-58C941D86057}"
 EndProject

diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/.gitignore b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/.gitignore
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/encodings.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/encodings.xml
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/indexLayout.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/indexLayout.xml
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/vcs.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/vcs.xml
diff --git a/Commands/CommandCollection.cs → src/CS2/Commands/CommandCollection.cs b/Commands/CommandCollection.cs → src/CS2/Commands/CommandCollection.cs
diff --git a/Commands/CommandManager.cs → src/CS2/Commands/CommandManager.cs b/Commands/CommandManager.cs → src/CS2/Commands/CommandManager.cs
diff --git a/Commands/Commands.csproj → src/CS2/Commands/Commands.csproj b/Commands/Commands.csproj → src/CS2/Commands/Commands.csproj
@@ -11,8 +11,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\GangsAPI\GangsAPI.csproj"/>
-        <ProjectReference Include="..\GangsImpl\Mock\Mock.csproj"/>
+      <ProjectReference Include="..\..\GangsAPI\GangsAPI.csproj" />
+      <ProjectReference Include="..\..\GangsImpl\Mock\Mock.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Commands/Gang/CreateCommand.cs → src/CS2/Commands/Gang/CreateCommand.cs b/Commands/Gang/CreateCommand.cs → src/CS2/Commands/Gang/CreateCommand.cs
diff --git a/Commands/Gang/HelpCommand.cs → src/CS2/Commands/Gang/HelpCommand.cs b/Commands/Gang/HelpCommand.cs → src/CS2/Commands/Gang/HelpCommand.cs
diff --git a/Commands/GangCommand.cs → src/CS2/Commands/GangCommand.cs b/Commands/GangCommand.cs → src/CS2/Commands/GangCommand.cs
diff --git a/Gangs/CS2Gangs.cs → src/CS2/Gangs/CS2Gangs.cs b/Gangs/CS2Gangs.cs → src/CS2/Gangs/CS2Gangs.cs
diff --git a/Gangs/GangServiceCollection.cs → src/CS2/Gangs/GangServiceCollection.cs b/Gangs/GangServiceCollection.cs → src/CS2/Gangs/GangServiceCollection.cs
diff --git a/Gangs/Gangs.csproj → src/CS2/Gangs/Gangs.csproj b/Gangs/Gangs.csproj → src/CS2/Gangs/Gangs.csproj
@@ -9,8 +9,8 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Commands\Commands.csproj"/>
-        <ProjectReference Include="..\GangsAPI\GangsAPI.csproj"/>
-        <ProjectReference Include="..\GangsImpl\MySQL\MySQL.csproj"/>
+        <ProjectReference Include="..\..\GangsAPI\GangsAPI.csproj"/>
+        <ProjectReference Include="..\..\GangsImpl\MySQL\MySQL.csproj"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/GangsAPI/Data/Command/CommandInfoWrapper.cs → ...ngsAPI/Data/Command/CommandInfoWrapper.cs b/GangsAPI/Data/Command/CommandInfoWrapper.cs → ...ngsAPI/Data/Command/CommandInfoWrapper.cs
diff --git a/GangsAPI/Data/Command/CommandResult.cs → src/GangsAPI/Data/Command/CommandResult.cs b/GangsAPI/Data/Command/CommandResult.cs → src/GangsAPI/Data/Command/CommandResult.cs
diff --git a/GangsAPI/Data/Gang/IGang.cs → src/GangsAPI/Data/Gang/IGang.cs b/GangsAPI/Data/Gang/IGang.cs → src/GangsAPI/Data/Gang/IGang.cs
diff --git a/GangsAPI/Data/Gang/IGangPlayer.cs → src/GangsAPI/Data/Gang/IGangPlayer.cs b/GangsAPI/Data/Gang/IGangPlayer.cs → src/GangsAPI/Data/Gang/IGangPlayer.cs
diff --git a/GangsAPI/Data/ICacher.cs → src/GangsAPI/Data/ICacher.cs b/GangsAPI/Data/ICacher.cs → src/GangsAPI/Data/ICacher.cs
diff --git a/GangsAPI/Data/PlayerWrapper.cs → src/GangsAPI/Data/PlayerWrapper.cs b/GangsAPI/Data/PlayerWrapper.cs → src/GangsAPI/Data/PlayerWrapper.cs
diff --git a/GangsAPI/Data/Stat/IGangPerk.cs → src/GangsAPI/Data/Stat/IGangPerk.cs b/GangsAPI/Data/Stat/IGangPerk.cs → src/GangsAPI/Data/Stat/IGangPerk.cs
diff --git a/GangsAPI/Data/Stat/IPerk.cs → src/GangsAPI/Data/Stat/IPerk.cs b/GangsAPI/Data/Stat/IPerk.cs → src/GangsAPI/Data/Stat/IPerk.cs
diff --git a/GangsAPI/Data/Stat/IPlayerPerk.cs → src/GangsAPI/Data/Stat/IPlayerPerk.cs b/GangsAPI/Data/Stat/IPlayerPerk.cs → src/GangsAPI/Data/Stat/IPlayerPerk.cs
diff --git a/GangsAPI/Data/Stat/IStat.cs → src/GangsAPI/Data/Stat/IStat.cs b/GangsAPI/Data/Stat/IStat.cs → src/GangsAPI/Data/Stat/IStat.cs
diff --git a/...Extensions/ServiceCollectionExtensions.cs → ...Extensions/ServiceCollectionExtensions.cs b/...Extensions/ServiceCollectionExtensions.cs → ...Extensions/ServiceCollectionExtensions.cs
diff --git a/GangsAPI/GangsAPI.csproj → src/GangsAPI/GangsAPI.csproj b/GangsAPI/GangsAPI.csproj → src/GangsAPI/GangsAPI.csproj
diff --git a/GangsAPI/IBehavior.cs → src/GangsAPI/IBehavior.cs b/GangsAPI/IBehavior.cs → src/GangsAPI/IBehavior.cs
diff --git a/GangsAPI/IGangPlugin.cs → src/GangsAPI/IGangPlugin.cs b/GangsAPI/IGangPlugin.cs → src/GangsAPI/IGangPlugin.cs
diff --git a/GangsAPI/IPluginBehavior.cs → src/GangsAPI/IPluginBehavior.cs b/GangsAPI/IPluginBehavior.cs → src/GangsAPI/IPluginBehavior.cs
diff --git a/GangsAPI/MSG.cs → src/GangsAPI/MSG.cs b/GangsAPI/MSG.cs → src/GangsAPI/MSG.cs
diff --git a/GangsAPI/Permissions/IGangRank.cs → src/GangsAPI/Permissions/IGangRank.cs b/GangsAPI/Permissions/IGangRank.cs → src/GangsAPI/Permissions/IGangRank.cs
diff --git a/GangsAPI/Permissions/IPermDictator.cs → src/GangsAPI/Permissions/IPermDictator.cs b/GangsAPI/Permissions/IPermDictator.cs → src/GangsAPI/Permissions/IPermDictator.cs
diff --git a/GangsAPI/Services/Commands/ICommand.cs → src/GangsAPI/Services/Commands/ICommand.cs b/GangsAPI/Services/Commands/ICommand.cs → src/GangsAPI/Services/Commands/ICommand.cs
diff --git a/...sAPI/Services/Commands/ICommandManager.cs → ...sAPI/Services/Commands/ICommandManager.cs b/...sAPI/Services/Commands/ICommandManager.cs → ...sAPI/Services/Commands/ICommandManager.cs
diff --git a/GangsAPI/Services/Gang/IGangManager.cs → src/GangsAPI/Services/Gang/IGangManager.cs b/GangsAPI/Services/Gang/IGangManager.cs → src/GangsAPI/Services/Gang/IGangManager.cs
diff --git a/GangsAPI/Services/Gang/IGangStatManager.cs → ...angsAPI/Services/Gang/IGangStatManager.cs b/GangsAPI/Services/Gang/IGangStatManager.cs → ...angsAPI/Services/Gang/IGangStatManager.cs
diff --git a/GangsAPI/Services/IStatManager.cs → src/GangsAPI/Services/IStatManager.cs b/GangsAPI/Services/IStatManager.cs → src/GangsAPI/Services/IStatManager.cs
diff --git a/GangsAPI/Services/Player/IPlayerManager.cs → ...angsAPI/Services/Player/IPlayerManager.cs b/GangsAPI/Services/Player/IPlayerManager.cs → ...angsAPI/Services/Player/IPlayerManager.cs
diff --git a/...API/Services/Player/IPlayerStatManager.cs → ...API/Services/Player/IPlayerStatManager.cs b/...API/Services/Player/IPlayerStatManager.cs → ...API/Services/Player/IPlayerStatManager.cs
diff --git a/GangsImpl/AbstractDB/AbstractDB.csproj → src/GangsImpl/AbstractDB/AbstractDB.csproj b/GangsImpl/AbstractDB/AbstractDB.csproj → src/GangsImpl/AbstractDB/AbstractDB.csproj
diff --git a/...sImpl/AbstractDB/AbstractDBGangManager.cs → ...sImpl/AbstractDB/AbstractDBGangManager.cs b/...sImpl/AbstractDB/AbstractDBGangManager.cs → ...sImpl/AbstractDB/AbstractDBGangManager.cs
diff --git a/...mpl/AbstractDB/AbstractDBPlayerManager.cs → ...mpl/AbstractDB/AbstractDBPlayerManager.cs b/...mpl/AbstractDB/AbstractDBPlayerManager.cs → ...mpl/AbstractDB/AbstractDBPlayerManager.cs
diff --git a/...sImpl/AbstractDB/AbstractDBStatManager.cs → ...sImpl/AbstractDB/AbstractDBStatManager.cs b/...sImpl/AbstractDB/AbstractDBStatManager.cs → ...sImpl/AbstractDB/AbstractDBStatManager.cs
diff --git a/...mpl/AbstractDB/AbstractInstanceManager.cs → ...mpl/AbstractDB/AbstractInstanceManager.cs b/...mpl/AbstractDB/AbstractInstanceManager.cs → ...mpl/AbstractDB/AbstractInstanceManager.cs
diff --git a/GangsImpl/AbstractDB/DBGang.cs → src/GangsImpl/AbstractDB/DBGang.cs b/GangsImpl/AbstractDB/DBGang.cs → src/GangsImpl/AbstractDB/DBGang.cs
diff --git a/GangsImpl/AbstractDB/DBPlayer.cs → src/GangsImpl/AbstractDB/DBPlayer.cs b/GangsImpl/AbstractDB/DBPlayer.cs → src/GangsImpl/AbstractDB/DBPlayer.cs
diff --git a/GangsImpl/AbstractDB/DBStat.cs → src/GangsImpl/AbstractDB/DBStat.cs b/GangsImpl/AbstractDB/DBStat.cs → src/GangsImpl/AbstractDB/DBStat.cs
diff --git a/GangsImpl/Mock/Mock.csproj → src/GangsImpl/Mock/Mock.csproj b/GangsImpl/Mock/Mock.csproj → src/GangsImpl/Mock/Mock.csproj
diff --git a/GangsImpl/Mock/MockCommandManager.cs → src/GangsImpl/Mock/MockCommandManager.cs b/GangsImpl/Mock/MockCommandManager.cs → src/GangsImpl/Mock/MockCommandManager.cs
diff --git a/GangsImpl/Mock/MockGang.cs → src/GangsImpl/Mock/MockGang.cs b/GangsImpl/Mock/MockGang.cs → src/GangsImpl/Mock/MockGang.cs
diff --git a/GangsImpl/Mock/MockGangManager.cs → src/GangsImpl/Mock/MockGangManager.cs b/GangsImpl/Mock/MockGangManager.cs → src/GangsImpl/Mock/MockGangManager.cs
diff --git a/GangsImpl/Mock/MockGangRank.cs → src/GangsImpl/Mock/MockGangRank.cs b/GangsImpl/Mock/MockGangRank.cs → src/GangsImpl/Mock/MockGangRank.cs
diff --git a/GangsImpl/Mock/MockInstanceStatManager.cs → ...GangsImpl/Mock/MockInstanceStatManager.cs b/GangsImpl/Mock/MockInstanceStatManager.cs → ...GangsImpl/Mock/MockInstanceStatManager.cs
diff --git a/GangsImpl/Mock/MockPlayer.cs → src/GangsImpl/Mock/MockPlayer.cs b/GangsImpl/Mock/MockPlayer.cs → src/GangsImpl/Mock/MockPlayer.cs
diff --git a/GangsImpl/Mock/MockPlayerManager.cs → src/GangsImpl/Mock/MockPlayerManager.cs b/GangsImpl/Mock/MockPlayerManager.cs → src/GangsImpl/Mock/MockPlayerManager.cs
diff --git a/GangsImpl/Mock/MockStat.cs → src/GangsImpl/Mock/MockStat.cs b/GangsImpl/Mock/MockStat.cs → src/GangsImpl/Mock/MockStat.cs
diff --git a/GangsImpl/Mock/MockStatManager.cs → src/GangsImpl/Mock/MockStatManager.cs b/GangsImpl/Mock/MockStatManager.cs → src/GangsImpl/Mock/MockStatManager.cs
diff --git a/GangsImpl/MySQL/MySQL.csproj → src/GangsImpl/MySQL/MySQL.csproj b/GangsImpl/MySQL/MySQL.csproj → src/GangsImpl/MySQL/MySQL.csproj
diff --git a/GangsImpl/MySQL/MySQLGangManager.cs → src/GangsImpl/MySQL/MySQLGangManager.cs b/GangsImpl/MySQL/MySQLGangManager.cs → src/GangsImpl/MySQL/MySQLGangManager.cs
diff --git a/GangsImpl/MySQL/MySQLInstanceManager.cs → src/GangsImpl/MySQL/MySQLInstanceManager.cs b/GangsImpl/MySQL/MySQLInstanceManager.cs → src/GangsImpl/MySQL/MySQLInstanceManager.cs
diff --git a/GangsImpl/MySQL/MySQLPlayerManager.cs → src/GangsImpl/MySQL/MySQLPlayerManager.cs b/GangsImpl/MySQL/MySQLPlayerManager.cs → src/GangsImpl/MySQL/MySQLPlayerManager.cs
diff --git a/GangsImpl/MySQL/MySQLStatManager.cs → src/GangsImpl/MySQL/MySQLStatManager.cs b/GangsImpl/MySQL/MySQLStatManager.cs → src/GangsImpl/MySQL/MySQLStatManager.cs
diff --git a/GangsImpl/SQLite/SQLite.csproj → src/GangsImpl/SQLite/SQLite.csproj b/GangsImpl/SQLite/SQLite.csproj → src/GangsImpl/SQLite/SQLite.csproj
diff --git a/GangsImpl/SQLite/SQLiteGangManager.cs → src/GangsImpl/SQLite/SQLiteGangManager.cs b/GangsImpl/SQLite/SQLiteGangManager.cs → src/GangsImpl/SQLite/SQLiteGangManager.cs
diff --git a/GangsImpl/SQLite/SQLiteInstanceManager.cs → ...GangsImpl/SQLite/SQLiteInstanceManager.cs b/GangsImpl/SQLite/SQLiteInstanceManager.cs → ...GangsImpl/SQLite/SQLiteInstanceManager.cs
diff --git a/GangsImpl/SQLite/SQLitePlayerManager.cs → src/GangsImpl/SQLite/SQLitePlayerManager.cs b/GangsImpl/SQLite/SQLitePlayerManager.cs → src/GangsImpl/SQLite/SQLitePlayerManager.cs
diff --git a/GangsImpl/SQLite/SQLiteStatManager.cs → src/GangsImpl/SQLite/SQLiteStatManager.cs b/GangsImpl/SQLite/SQLiteStatManager.cs → src/GangsImpl/SQLite/SQLiteStatManager.cs
diff --git a/GangsImpl/Stats/BalanceStat.cs → src/GangsImpl/Stats/BalanceStat.cs b/GangsImpl/Stats/BalanceStat.cs → src/GangsImpl/Stats/BalanceStat.cs
diff --git a/GangsImpl/Stats/BaseStat.cs → src/GangsImpl/Stats/BaseStat.cs b/GangsImpl/Stats/BaseStat.cs → src/GangsImpl/Stats/BaseStat.cs
diff --git a/GangsImpl/Stats/CapacityStat.cs → src/GangsImpl/Stats/CapacityStat.cs b/GangsImpl/Stats/CapacityStat.cs → src/GangsImpl/Stats/CapacityStat.cs
diff --git a/GangsImpl/Stats/DescriptionStat.cs → src/GangsImpl/Stats/DescriptionStat.cs b/GangsImpl/Stats/DescriptionStat.cs → src/GangsImpl/Stats/DescriptionStat.cs
diff --git a/GangsImpl/Stats/Stats.csproj → src/GangsImpl/Stats/Stats.csproj b/GangsImpl/Stats/Stats.csproj → src/GangsImpl/Stats/Stats.csproj
diff --git a/...t/API/Data/Command/CommandWrapperTests.cs → ...t/API/Data/Command/CommandWrapperTests.cs b/...t/API/Data/Command/CommandWrapperTests.cs → ...t/API/Data/Command/CommandWrapperTests.cs
diff --git a/GangsTest/API/Permissions/GangRankTests.cs → ...angsTest/API/Permissions/GangRankTests.cs b/GangsTest/API/Permissions/GangRankTests.cs → ...angsTest/API/Permissions/GangRankTests.cs
diff --git a/GangsTest/API/PlayerWrapperTests.cs → src/GangsTest/API/PlayerWrapperTests.cs b/GangsTest/API/PlayerWrapperTests.cs → src/GangsTest/API/PlayerWrapperTests.cs
diff --git a/.../Commands/Command/Concrete/CreateTests.cs → .../Commands/Command/Concrete/CreateTests.cs b/.../Commands/Command/Concrete/CreateTests.cs → .../Commands/Command/Concrete/CreateTests.cs
diff --git a/...es/Commands/Command/Concrete/GangTests.cs → ...es/Commands/Command/Concrete/GangTests.cs b/...es/Commands/Command/Concrete/GangTests.cs → ...es/Commands/Command/Concrete/GangTests.cs
diff --git a/...I/Services/Commands/Command/FieldTests.cs → ...I/Services/Commands/Command/FieldTests.cs b/...I/Services/Commands/Command/FieldTests.cs → ...I/Services/Commands/Command/FieldTests.cs
diff --git a/...I/Services/Commands/Command/LogicTests.cs → ...I/Services/Commands/Command/LogicTests.cs b/...I/Services/Commands/Command/LogicTests.cs → ...I/Services/Commands/Command/LogicTests.cs
diff --git a/...vices/Commands/Command/PermissionTests.cs → ...vices/Commands/Command/PermissionTests.cs b/...vices/Commands/Command/PermissionTests.cs → ...vices/Commands/Command/PermissionTests.cs
diff --git a/...API/Services/Commands/Command/TestData.cs → ...API/Services/Commands/Command/TestData.cs b/...API/Services/Commands/Command/TestData.cs → ...API/Services/Commands/Command/TestData.cs
diff --git a/...I/Services/Commands/Command/TestParent.cs → ...I/Services/Commands/Command/TestParent.cs b/...I/Services/Commands/Command/TestParent.cs → ...I/Services/Commands/Command/TestParent.cs
@@ -1,4 +1,5 @@
-using GangsAPI.Data;
+using Commands;
+using GangsAPI.Data;
 using GangsAPI.Services.Commands;
 
 namespace GangsTest.API.Services.Commands.Command;

diff --git a/...ces/Commands/CommandManager/AliasTests.cs → ...ces/Commands/CommandManager/AliasTests.cs b/...ces/Commands/CommandManager/AliasTests.cs → ...ces/Commands/CommandManager/AliasTests.cs
diff --git a/...ommands/CommandManager/PlayerOnlyTests.cs → ...ommands/CommandManager/PlayerOnlyTests.cs b/...ommands/CommandManager/PlayerOnlyTests.cs → ...ommands/CommandManager/PlayerOnlyTests.cs
diff --git a/...mands/CommandManager/RegistrationTests.cs → ...mands/CommandManager/RegistrationTests.cs b/...mands/CommandManager/RegistrationTests.cs → ...mands/CommandManager/RegistrationTests.cs
diff --git a/...vices/Commands/CommandManager/TestData.cs → ...vices/Commands/CommandManager/TestData.cs b/...vices/Commands/CommandManager/TestData.cs → ...vices/Commands/CommandManager/TestData.cs
diff --git a/...ces/Commands/CommandManager/TestParent.cs → ...ces/Commands/CommandManager/TestParent.cs b/...ces/Commands/CommandManager/TestParent.cs → ...ces/Commands/CommandManager/TestParent.cs
diff --git a/GangsTest/API/Services/Gang/CreationTests.cs → ...gsTest/API/Services/Gang/CreationTests.cs b/GangsTest/API/Services/Gang/CreationTests.cs → ...gsTest/API/Services/Gang/CreationTests.cs
diff --git a/GangsTest/API/Services/Gang/DeletionTests.cs → ...gsTest/API/Services/Gang/DeletionTests.cs b/GangsTest/API/Services/Gang/DeletionTests.cs → ...gsTest/API/Services/Gang/DeletionTests.cs
diff --git a/GangsTest/API/Services/Gang/FetchTests.cs → ...GangsTest/API/Services/Gang/FetchTests.cs b/GangsTest/API/Services/Gang/FetchTests.cs → ...GangsTest/API/Services/Gang/FetchTests.cs
diff --git a/GangsTest/API/Services/Gang/FieldTests.cs → ...GangsTest/API/Services/Gang/FieldTests.cs b/GangsTest/API/Services/Gang/FieldTests.cs → ...GangsTest/API/Services/Gang/FieldTests.cs
diff --git a/...Test/API/Services/Gang/MutabilityTests.cs → ...Test/API/Services/Gang/MutabilityTests.cs b/...Test/API/Services/Gang/MutabilityTests.cs → ...Test/API/Services/Gang/MutabilityTests.cs
diff --git a/...est/API/Services/Gang/PersistenceTests.cs → ...est/API/Services/Gang/PersistenceTests.cs b/...est/API/Services/Gang/PersistenceTests.cs → ...est/API/Services/Gang/PersistenceTests.cs
diff --git a/GangsTest/API/Services/Gang/TestData.cs → src/GangsTest/API/Services/Gang/TestData.cs b/GangsTest/API/Services/Gang/TestData.cs → src/GangsTest/API/Services/Gang/TestData.cs
diff --git a/GangsTest/API/Services/Gang/UpdateTests.cs → ...angsTest/API/Services/Gang/UpdateTests.cs b/GangsTest/API/Services/Gang/UpdateTests.cs → ...angsTest/API/Services/Gang/UpdateTests.cs
diff --git a/...Test/API/Services/Player/CreationTests.cs → ...Test/API/Services/Player/CreationTests.cs b/...Test/API/Services/Player/CreationTests.cs → ...Test/API/Services/Player/CreationTests.cs
diff --git a/GangsTest/API/Services/Player/TestData.cs → ...GangsTest/API/Services/Player/TestData.cs b/GangsTest/API/Services/Player/TestData.cs → ...GangsTest/API/Services/Player/TestData.cs
diff --git a/...I/Services/Stat/Concrete/ConcreteTests.cs → ...I/Services/Stat/Concrete/ConcreteTests.cs b/...I/Services/Stat/Concrete/ConcreteTests.cs → ...I/Services/Stat/Concrete/ConcreteTests.cs
diff --git a/...st/API/Services/Stat/Concrete/TestData.cs → ...st/API/Services/Stat/Concrete/TestData.cs b/...st/API/Services/Stat/Concrete/TestData.cs → ...st/API/Services/Stat/Concrete/TestData.cs
diff --git a/GangsTest/API/Services/Stat/EqualityTests.cs → ...gsTest/API/Services/Stat/EqualityTests.cs b/GangsTest/API/Services/Stat/EqualityTests.cs → ...gsTest/API/Services/Stat/EqualityTests.cs
diff --git a/GangsTest/API/Services/Stat/FieldTests.cs → ...GangsTest/API/Services/Stat/FieldTests.cs b/GangsTest/API/Services/Stat/FieldTests.cs → ...GangsTest/API/Services/Stat/FieldTests.cs
diff --git a/...I/Services/Stat/Instance/EqualityTests.cs → ...I/Services/Stat/Instance/EqualityTests.cs b/...I/Services/Stat/Instance/EqualityTests.cs → ...I/Services/Stat/Instance/EqualityTests.cs
diff --git a/.../Services/Stat/Instance/Gang/PushTests.cs → .../Services/Stat/Instance/Gang/PushTests.cs b/.../Services/Stat/Instance/Gang/PushTests.cs → .../Services/Stat/Instance/Gang/PushTests.cs
diff --git a/...I/Services/Stat/Instance/Gang/TestData.cs → ...I/Services/Stat/Instance/Gang/TestData.cs b/...I/Services/Stat/Instance/Gang/TestData.cs → ...I/Services/Stat/Instance/Gang/TestData.cs
diff --git a/...vices/Stat/Instance/Gang/TestInstances.cs → ...vices/Stat/Instance/Gang/TestInstances.cs b/...vices/Stat/Instance/Gang/TestInstances.cs → ...vices/Stat/Instance/Gang/TestInstances.cs
diff --git a/...Services/Stat/Instance/Gang/TestParent.cs → ...Services/Stat/Instance/Gang/TestParent.cs b/...Services/Stat/Instance/Gang/TestParent.cs → ...Services/Stat/Instance/Gang/TestParent.cs
diff --git a/...ervices/Stat/Instance/Player/PushTests.cs → ...ervices/Stat/Instance/Player/PushTests.cs b/...ervices/Stat/Instance/Player/PushTests.cs → ...ervices/Stat/Instance/Player/PushTests.cs
diff --git a/...Services/Stat/Instance/Player/TestData.cs → ...Services/Stat/Instance/Player/TestData.cs b/...Services/Stat/Instance/Player/TestData.cs → ...Services/Stat/Instance/Player/TestData.cs
diff --git a/...rvices/Stat/Instance/Player/TestParent.cs → ...rvices/Stat/Instance/Player/TestParent.cs b/...rvices/Stat/Instance/Player/TestParent.cs → ...rvices/Stat/Instance/Player/TestParent.cs
diff --git a/.../Services/Stat/Instance/StatTestParent.cs → .../Services/Stat/Instance/StatTestParent.cs b/.../Services/Stat/Instance/StatTestParent.cs → .../Services/Stat/Instance/StatTestParent.cs
diff --git a/...PI/Services/Stat/Manager/CreationTests.cs → ...PI/Services/Stat/Manager/CreationTests.cs b/...PI/Services/Stat/Manager/CreationTests.cs → ...PI/Services/Stat/Manager/CreationTests.cs
diff --git a/...ervices/Stat/Manager/RegistrationTests.cs → ...ervices/Stat/Manager/RegistrationTests.cs b/...ervices/Stat/Manager/RegistrationTests.cs → ...ervices/Stat/Manager/RegistrationTests.cs
diff --git a/.../API/Services/Stat/Manager/RetainTests.cs → .../API/Services/Stat/Manager/RetainTests.cs b/.../API/Services/Stat/Manager/RetainTests.cs → .../API/Services/Stat/Manager/RetainTests.cs
diff --git a/...est/API/Services/Stat/Manager/TestData.cs → ...est/API/Services/Stat/Manager/TestData.cs b/...est/API/Services/Stat/Manager/TestData.cs → ...est/API/Services/Stat/Manager/TestData.cs
diff --git a/GangsTest/GangsTest.csproj → src/GangsTest/GangsTest.csproj b/GangsTest/GangsTest.csproj → src/GangsTest/GangsTest.csproj
@@ -29,11 +29,12 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\CS2\Commands\Commands.csproj" />
         <ProjectReference Include="..\GangsImpl\Mock\Mock.csproj"/>
         <ProjectReference Include="..\GangsImpl\SQLite\SQLite.csproj"/>
         <ProjectReference Include="..\GangsImpl\MySQL\MySQL.csproj"/>
         <ProjectReference Include="..\GangsImpl\Stats\Stats.csproj"/>
-        <ProjectReference Include="..\Gangs\Gangs.csproj"/>
+        <ProjectReference Include="..\CS2\Gangs\Gangs.csproj"/>
     </ItemGroup>
 
 </Project>
diff --git a/GangsTest/Startup.cs → src/GangsTest/Startup.cs b/GangsTest/Startup.cs → src/GangsTest/Startup.cs
diff --git a/GangsTest/TestLocale/FormatTests.cs → src/GangsTest/TestLocale/FormatTests.cs b/GangsTest/TestLocale/FormatTests.cs → src/GangsTest/TestLocale/FormatTests.cs
diff --git a/...t/TestLocale/LocalFileLocalizerFactory.cs → ...t/TestLocale/LocalFileLocalizerFactory.cs b/...t/TestLocale/LocalFileLocalizerFactory.cs → ...t/TestLocale/LocalFileLocalizerFactory.cs
diff --git a/GangsTest/TestLocale/LocaleFileKVData.cs → src/GangsTest/TestLocale/LocaleFileKVData.cs b/GangsTest/TestLocale/LocaleFileKVData.cs → src/GangsTest/TestLocale/LocaleFileKVData.cs
diff --git a/GangsTest/TestLocale/LocaleImplData.cs → src/GangsTest/TestLocale/LocaleImplData.cs b/GangsTest/TestLocale/LocaleImplData.cs → src/GangsTest/TestLocale/LocaleImplData.cs
diff --git a/GangsTest/TestLocale/ParityTests.cs → src/GangsTest/TestLocale/ParityTests.cs b/GangsTest/TestLocale/ParityTests.cs → src/GangsTest/TestLocale/ParityTests.cs
diff --git a/GangsTest/TestLocale/PrefixTests.cs → src/GangsTest/TestLocale/PrefixTests.cs b/GangsTest/TestLocale/PrefixTests.cs → src/GangsTest/TestLocale/PrefixTests.cs
diff --git a/GangsTest/TestLocale/StringLocalizer.cs → src/GangsTest/TestLocale/StringLocalizer.cs b/GangsTest/TestLocale/StringLocalizer.cs → src/GangsTest/TestLocale/StringLocalizer.cs