diff --git a/PartyModeChallenge/ChallengeRounds.cs b/PartyModes/PartyModeChallenge/ChallengeRounds.cs
similarity index 100%
rename from PartyModeChallenge/ChallengeRounds.cs
rename to PartyModes/PartyModeChallenge/ChallengeRounds.cs
diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModes/PartyModeChallenge/PartyModeChallenge.cs
similarity index 100%
rename from PartyModeChallenge/PartyModeChallenge.cs
rename to PartyModes/PartyModeChallenge/PartyModeChallenge.cs
diff --git a/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
similarity index 90%
rename from PartyModeChallenge/PartyModeChallenge.csproj
rename to PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index 3155de6c..83f7959f 100644
--- a/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -42,7 +42,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -52,7 +52,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -64,7 +64,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -74,7 +74,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -86,7 +86,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -96,7 +96,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -124,7 +124,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\VocaluxeLib\VocaluxeLib.csproj">
+    <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
       <Project>{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}</Project>
       <Name>VocaluxeLib</Name>
       <Private>False</Private>
diff --git a/PartyModeChallenge/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
similarity index 100%
rename from PartyModeChallenge/PartyScreenChallengeConfig.cs
rename to PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
diff --git a/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
similarity index 100%
rename from PartyModeChallenge/PartyScreenChallengeMain.cs
rename to PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
diff --git a/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
similarity index 100%
rename from PartyModeChallenge/PartyScreenChallengeNames.cs
rename to PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
diff --git a/Vocaluxe.sln b/Vocaluxe.sln
index d414aae2..301a30e2 100644
--- a/Vocaluxe.sln
+++ b/Vocaluxe.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocalu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocaluxeLib", "VocaluxeLib\VocaluxeLib.csproj", "{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartyModeChallenge", "PartyModeChallenge\PartyModeChallenge.csproj", "{6F3E1874-F28A-40E9-AFBD-31934D593679}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartyModeChallenge", "PartyModes\PartyModeChallenge\PartyModeChallenge.csproj", "{6F3E1874-F28A-40E9-AFBD-31934D593679}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution