diff --git a/VocaluxeLib/Game/CBasic.cs b/VocaluxeLib/CBasic.cs
similarity index 100%
rename from VocaluxeLib/Game/CBasic.cs
rename to VocaluxeLib/CBasic.cs
diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj
index 93b1517f..02de35fe 100644
--- a/VocaluxeLib/VocaluxeLib.csproj
+++ b/VocaluxeLib/VocaluxeLib.csproj
@@ -112,10 +112,10 @@
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Menu\CBackground.cs" />
-    <Compile Include="Menu\CBasic.cs" />
+    <Compile Include="CBasic.cs" />
     <Compile Include="Menu\CButton.cs" />
     <Compile Include="Menu\CEqualizer.cs" />
-    <Compile Include="Menu\CHelper.cs" />
+    <Compile Include="CHelper.cs" />
     <Compile Include="Menu\CInteraction.cs" />
     <Compile Include="Menu\CLyric.cs" />
     <Compile Include="Menu\CMenu.cs" />
@@ -125,20 +125,20 @@
     <Compile Include="Menu\COrderedDictionaryLite.cs" />
     <Compile Include="Menu\CParticle.cs" />
     <Compile Include="Menu\CPlaylist.cs" />
-    <Compile Include="Menu\CPoints.cs" />
+    <Compile Include="Game\CPoints.cs" />
     <Compile Include="Menu\CSelectSlide.cs" />
     <Compile Include="Menu\CStatic.cs" />
     <Compile Include="Menu\CText.cs" />
     <Compile Include="Menu\CScreenSetting.cs" />
-    <Compile Include="Menu\CXMLReader.cs" />
-    <Compile Include="Menu\Enums.cs" />
+    <Compile Include="CXMLReader.cs" />
+    <Compile Include="Enums.cs" />
     <Compile Include="Menu\IMenu.cs" />
     <Compile Include="Menu\IMenuElement.cs" />
-    <Compile Include="Menu\SingNotes\CNotes.cs" />
+    <Compile Include="Songs\CNotes.cs" />
     <Compile Include="Menu\SingNotes\CSingNotes.cs" />
     <Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
-    <Compile Include="Menu\SongMenu\CCategory.cs" />
-    <Compile Include="Menu\SongMenu\CSong.cs" />
+    <Compile Include="Songs\CCategory.cs" />
+    <Compile Include="Songs\CSong.cs" />
     <Compile Include="Menu\SongMenu\CSongMenu.cs" />
     <Compile Include="Menu\SongMenu\CSongMenuBook.cs" />
     <Compile Include="Menu\SongMenu\CSongMenuDreidel.cs" />
@@ -146,7 +146,7 @@
     <Compile Include="Menu\SongMenu\CSongMenuList.cs" />
     <Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
     <Compile Include="Menu\SongMenu\ISongMenu.cs" />
-    <Compile Include="Menu\Structs.cs" />
+    <Compile Include="Structs.cs" />
     <Compile Include="PartyModes\CPartyMode.cs" />
     <Compile Include="PartyModes\CPartyModeNone.cs" />
     <Compile Include="PartyModes\CScreenPartyDummy.cs" />