diff --git a/.gitignore b/.gitignore
index 9d86576..19aaf3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,14 +14,17 @@ ChovySign-CLI/obj/*
 DiscUtils/bin/*
 DiscUtils/obj/*
 
-PopsBuilder/bin/*
-PopsBuilder/obj/*
+GameBuilder/bin/*
+GameBuilder/obj/*
 
 PspCrypto/bin/*
 PspCrypto/obj/*
 
-PsvImage/bin/*
-PsvImage/obj/*
+LiLib/bin/*
+LiLib/obj/*
+
+Vita/bin/*
+Vita/obj/*
 
 UnicornTest/*
 UnicornManaged/*
\ No newline at end of file
diff --git a/ChovySign-CLI/ChovySign-CLI.csproj b/ChovySign-CLI/ChovySign-CLI.csproj
index 3a86ec8..88eee96 100644
--- a/ChovySign-CLI/ChovySign-CLI.csproj
+++ b/ChovySign-CLI/ChovySign-CLI.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PopsBuilder\GameBuilder.csproj" />
+    <ProjectReference Include="..\GameBuilder\GameBuilder.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PopsBuilder/Atrac3/Atrac3ToolEncoder.cs b/GameBuilder/Atrac3/Atrac3ToolEncoder.cs
similarity index 100%
rename from PopsBuilder/Atrac3/Atrac3ToolEncoder.cs
rename to GameBuilder/Atrac3/Atrac3ToolEncoder.cs
diff --git a/PopsBuilder/Atrac3/IAtracEncoderBase.cs b/GameBuilder/Atrac3/IAtracEncoderBase.cs
similarity index 100%
rename from PopsBuilder/Atrac3/IAtracEncoderBase.cs
rename to GameBuilder/Atrac3/IAtracEncoderBase.cs
diff --git a/PopsBuilder/Cue/CueIndex.cs b/GameBuilder/Cue/CueIndex.cs
similarity index 100%
rename from PopsBuilder/Cue/CueIndex.cs
rename to GameBuilder/Cue/CueIndex.cs
diff --git a/PopsBuilder/Cue/CueReader.cs b/GameBuilder/Cue/CueReader.cs
similarity index 100%
rename from PopsBuilder/Cue/CueReader.cs
rename to GameBuilder/Cue/CueReader.cs
diff --git a/PopsBuilder/Cue/CueStream.cs b/GameBuilder/Cue/CueStream.cs
similarity index 100%
rename from PopsBuilder/Cue/CueStream.cs
rename to GameBuilder/Cue/CueStream.cs
diff --git a/PopsBuilder/Cue/CueTrack.cs b/GameBuilder/Cue/CueTrack.cs
similarity index 100%
rename from PopsBuilder/Cue/CueTrack.cs
rename to GameBuilder/Cue/CueTrack.cs
diff --git a/PopsBuilder/Cue/TrackType.cs b/GameBuilder/Cue/TrackType.cs
similarity index 100%
rename from PopsBuilder/Cue/TrackType.cs
rename to GameBuilder/Cue/TrackType.cs
diff --git a/PopsBuilder/GameBuilder.csproj b/GameBuilder/GameBuilder.csproj
similarity index 91%
rename from PopsBuilder/GameBuilder.csproj
rename to GameBuilder/GameBuilder.csproj
index 1aff664..4534cb1 100644
--- a/PopsBuilder/GameBuilder.csproj
+++ b/GameBuilder/GameBuilder.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils\DiscUtils.csproj" />
-    <ProjectReference Include="..\LiGeneralUtilities\LiLib.csproj" />
+    <ProjectReference Include="..\LiLib\LiLib.csproj" />
     <ProjectReference Include="..\PspCrypto\PspCrypto.csproj" />
   </ItemGroup>
 
diff --git a/PopsBuilder/Pops/DiscCompressor.cs b/GameBuilder/Pops/DiscCompressor.cs
similarity index 100%
rename from PopsBuilder/Pops/DiscCompressor.cs
rename to GameBuilder/Pops/DiscCompressor.cs
diff --git a/PopsBuilder/Pops/DiscInfo.cs b/GameBuilder/Pops/DiscInfo.cs
similarity index 100%
rename from PopsBuilder/Pops/DiscInfo.cs
rename to GameBuilder/Pops/DiscInfo.cs
diff --git a/PopsBuilder/Pops/EccRemoverStream.cs b/GameBuilder/Pops/EccRemoverStream.cs
similarity index 100%
rename from PopsBuilder/Pops/EccRemoverStream.cs
rename to GameBuilder/Pops/EccRemoverStream.cs
diff --git a/PopsBuilder/Pops/PopsImg.cs b/GameBuilder/Pops/PopsImg.cs
similarity index 100%
rename from PopsBuilder/Pops/PopsImg.cs
rename to GameBuilder/Pops/PopsImg.cs
diff --git a/PopsBuilder/Pops/PsIsoImg.cs b/GameBuilder/Pops/PsIsoImg.cs
similarity index 100%
rename from PopsBuilder/Pops/PsIsoImg.cs
rename to GameBuilder/Pops/PsIsoImg.cs
diff --git a/PopsBuilder/Pops/PsTitleImg.cs b/GameBuilder/Pops/PsTitleImg.cs
similarity index 100%
rename from PopsBuilder/Pops/PsTitleImg.cs
rename to GameBuilder/Pops/PsTitleImg.cs
diff --git a/PopsBuilder/Psp/NpDrmInfo.cs b/GameBuilder/Psp/NpDrmInfo.cs
similarity index 100%
rename from PopsBuilder/Psp/NpDrmInfo.cs
rename to GameBuilder/Psp/NpDrmInfo.cs
diff --git a/PopsBuilder/Psp/NpDrmPsar.cs b/GameBuilder/Psp/NpDrmPsar.cs
similarity index 100%
rename from PopsBuilder/Psp/NpDrmPsar.cs
rename to GameBuilder/Psp/NpDrmPsar.cs
diff --git a/PopsBuilder/Psp/NpUmdImg.cs b/GameBuilder/Psp/NpUmdImg.cs
similarity index 100%
rename from PopsBuilder/Psp/NpUmdImg.cs
rename to GameBuilder/Psp/NpUmdImg.cs
diff --git a/PopsBuilder/Psp/PbpBuilder.cs b/GameBuilder/Psp/PbpBuilder.cs
similarity index 100%
rename from PopsBuilder/Psp/PbpBuilder.cs
rename to GameBuilder/Psp/PbpBuilder.cs
diff --git a/PopsBuilder/Psp/Rng.cs b/GameBuilder/Psp/Rng.cs
similarity index 100%
rename from PopsBuilder/Psp/Rng.cs
rename to GameBuilder/Psp/Rng.cs
diff --git a/PopsBuilder/Psp/Sfo.cs b/GameBuilder/Psp/Sfo.cs
similarity index 100%
rename from PopsBuilder/Psp/Sfo.cs
rename to GameBuilder/Psp/Sfo.cs
diff --git a/PopsBuilder/Psp/UmdInfo.cs b/GameBuilder/Psp/UmdInfo.cs
similarity index 100%
rename from PopsBuilder/Psp/UmdInfo.cs
rename to GameBuilder/Psp/UmdInfo.cs
diff --git a/PopsBuilder/Resources.Designer.cs b/GameBuilder/Resources.Designer.cs
similarity index 100%
rename from PopsBuilder/Resources.Designer.cs
rename to GameBuilder/Resources.Designer.cs
diff --git a/PopsBuilder/Resources.resx b/GameBuilder/Resources.resx
similarity index 100%
rename from PopsBuilder/Resources.resx
rename to GameBuilder/Resources.resx
diff --git a/PopsBuilder/Resources/DATAPSPSD.ELF b/GameBuilder/Resources/DATAPSPSD.ELF
similarity index 100%
rename from PopsBuilder/Resources/DATAPSPSD.ELF
rename to GameBuilder/Resources/DATAPSPSD.ELF
diff --git a/PopsBuilder/Resources/DATAPSPSDCFG.BIN b/GameBuilder/Resources/DATAPSPSDCFG.BIN
similarity index 100%
rename from PopsBuilder/Resources/DATAPSPSDCFG.BIN
rename to GameBuilder/Resources/DATAPSPSDCFG.BIN
diff --git a/PopsBuilder/Resources/SIMPLE.PNG b/GameBuilder/Resources/SIMPLE.PNG
similarity index 100%
rename from PopsBuilder/Resources/SIMPLE.PNG
rename to GameBuilder/Resources/SIMPLE.PNG
diff --git a/PopsBuilder/Resources/STARTDATMINIS.PNG b/GameBuilder/Resources/STARTDATMINIS.PNG
similarity index 100%
rename from PopsBuilder/Resources/STARTDATMINIS.PNG
rename to GameBuilder/Resources/STARTDATMINIS.PNG
diff --git a/PopsBuilder/Resources/STARTDATPOPS.PNG b/GameBuilder/Resources/STARTDATPOPS.PNG
similarity index 100%
rename from PopsBuilder/Resources/STARTDATPOPS.PNG
rename to GameBuilder/Resources/STARTDATPOPS.PNG
diff --git a/PopsBuilder/Resources/STARTDATPSP.PNG b/GameBuilder/Resources/STARTDATPSP.PNG
similarity index 100%
rename from PopsBuilder/Resources/STARTDATPSP.PNG
rename to GameBuilder/Resources/STARTDATPSP.PNG
diff --git a/PopsBuilder/VersionKey/ActRifMethod.cs b/GameBuilder/VersionKey/ActRifMethod.cs
similarity index 100%
rename from PopsBuilder/VersionKey/ActRifMethod.cs
rename to GameBuilder/VersionKey/ActRifMethod.cs
diff --git a/PopsBuilder/VersionKey/EbootPbpMethod.cs b/GameBuilder/VersionKey/EbootPbpMethod.cs
similarity index 100%
rename from PopsBuilder/VersionKey/EbootPbpMethod.cs
rename to GameBuilder/VersionKey/EbootPbpMethod.cs
diff --git a/LiGeneralUtilities/LiLib.csproj b/LiLib/LiLib.csproj
similarity index 100%
rename from LiGeneralUtilities/LiLib.csproj
rename to LiLib/LiLib.csproj
diff --git a/LiGeneralUtilities/MathUtil.cs b/LiLib/MathUtil.cs
similarity index 100%
rename from LiGeneralUtilities/MathUtil.cs
rename to LiLib/MathUtil.cs
diff --git a/LiGeneralUtilities/Progress/ProgressInfo.cs b/LiLib/Progress/ProgressInfo.cs
similarity index 100%
rename from LiGeneralUtilities/Progress/ProgressInfo.cs
rename to LiLib/Progress/ProgressInfo.cs
diff --git a/LiGeneralUtilities/Progress/ProgressTracker.cs b/LiLib/Progress/ProgressTracker.cs
similarity index 100%
rename from LiGeneralUtilities/Progress/ProgressTracker.cs
rename to LiLib/Progress/ProgressTracker.cs
diff --git a/LiGeneralUtilities/StreamUtil.cs b/LiLib/StreamUtil.cs
similarity index 100%
rename from LiGeneralUtilities/StreamUtil.cs
rename to LiLib/StreamUtil.cs
diff --git a/PbpResign/PbpResign.csproj b/PbpResign/PbpResign.csproj
index 6cca5a8..ed087da 100644
--- a/PbpResign/PbpResign.csproj
+++ b/PbpResign/PbpResign.csproj
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PopsBuilder\GameBuilder.csproj" />
+    <ProjectReference Include="..\GameBuilder\GameBuilder.csproj" />
     <ProjectReference Include="..\PspCrypto\PspCrypto.csproj" />
-    <ProjectReference Include="..\PsvImgTools\Vita.csproj" />
+    <ProjectReference Include="..\Vita\Vita.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/PspTest.sln b/PspTest.sln
index 35f4e67..9459107 100644
--- a/PspTest.sln
+++ b/PspTest.sln
@@ -23,12 +23,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChovySign-CLI", "ChovySign-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscUtils", "DiscUtils\DiscUtils.csproj", "{BF155D74-2923-432F-8566-26D83B15EEE8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "PsvImgTools\Vita.csproj", "{75BBF537-8ED8-42A3-AA8B-80A730F1B3F2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "Vita\Vita.csproj", "{75BBF537-8ED8-42A3-AA8B-80A730F1B3F2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{63475285-AAD2-4DE9-B698-AFC9FAA58AC8} = {63475285-AAD2-4DE9-B698-AFC9FAA58AC8}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiLib", "LiGeneralUtilities\LiLib.csproj", "{63475285-AAD2-4DE9-B698-AFC9FAA58AC8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiLib", "LiLib\LiLib.csproj", "{63475285-AAD2-4DE9-B698-AFC9FAA58AC8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/PsvImgTools/ContentManager/KeyGenerator.cs b/Vita/ContentManager/KeyGenerator.cs
similarity index 100%
rename from PsvImgTools/ContentManager/KeyGenerator.cs
rename to Vita/ContentManager/KeyGenerator.cs
diff --git a/PsvImgTools/PsvImgTools/PSVIMGBuilder.cs b/Vita/PsvImgTools/PSVIMGBuilder.cs
similarity index 100%
rename from PsvImgTools/PsvImgTools/PSVIMGBuilder.cs
rename to Vita/PsvImgTools/PSVIMGBuilder.cs
diff --git a/PsvImgTools/PsvImgTools/PSVIMGFileStream.cs b/Vita/PsvImgTools/PSVIMGFileStream.cs
similarity index 100%
rename from PsvImgTools/PsvImgTools/PSVIMGFileStream.cs
rename to Vita/PsvImgTools/PSVIMGFileStream.cs
diff --git a/PsvImgTools/PsvImgTools/PSVIMGStream.cs b/Vita/PsvImgTools/PSVIMGStream.cs
similarity index 100%
rename from PsvImgTools/PsvImgTools/PSVIMGStream.cs
rename to Vita/PsvImgTools/PSVIMGStream.cs
diff --git a/PsvImgTools/PsvImgTools/PSVIMGStructs.cs b/Vita/PsvImgTools/PSVIMGStructs.cs
similarity index 100%
rename from PsvImgTools/PsvImgTools/PSVIMGStructs.cs
rename to Vita/PsvImgTools/PSVIMGStructs.cs
diff --git a/PsvImgTools/PsvImgTools/PSVMDBuilder.cs b/Vita/PsvImgTools/PSVMDBuilder.cs
similarity index 100%
rename from PsvImgTools/PsvImgTools/PSVMDBuilder.cs
rename to Vita/PsvImgTools/PSVMDBuilder.cs
diff --git a/PsvImgTools/Vita.csproj b/Vita/Vita.csproj
similarity index 85%
rename from PsvImgTools/Vita.csproj
rename to Vita/Vita.csproj
index fa9bbf2..8820e9b 100644
--- a/PsvImgTools/Vita.csproj
+++ b/Vita/Vita.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\LiGeneralUtilities\LiLib.csproj" />
+    <ProjectReference Include="..\LiLib\LiLib.csproj" />
   </ItemGroup>
 
 </Project>