diff --git a/ReCodeIt_CLI/Commands/BuildCommand.cs b/ReCodeItCLI/Commands/BuildCommand.cs
similarity index 92%
rename from ReCodeIt_CLI/Commands/BuildCommand.cs
rename to ReCodeItCLI/Commands/BuildCommand.cs
index b6063ab..d960c53 100644
--- a/ReCodeIt_CLI/Commands/BuildCommand.cs
+++ b/ReCodeItCLI/Commands/BuildCommand.cs
@@ -2,6 +2,7 @@
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using ReCodeIt.CrossCompiler;
+using ReCodeIt.Utils;
 using ReCodeItLib.Utils;
 
 namespace ReCodeIt.Commands;
@@ -30,9 +31,13 @@ public class BuildCommand : ICommand
         if (RegistryHelper.GetRegistryValue<string>("LastLoadedProject") != null)
         {
             CrossCompiler = new();
+
+            DataProvider.LoadAppSettings();
+
             ProjectManager.LoadProject(RegistryHelper.GetRegistryValue<string>("LastLoadedProject"), true);
             CrossCompiler.StartCrossCompile();
 
+            DataProvider.SaveAppSettings();
             return default;
         }
 
diff --git a/ReCodeIt_CLI/Program.cs b/ReCodeItCLI/Program.cs
similarity index 100%
rename from ReCodeIt_CLI/Program.cs
rename to ReCodeItCLI/Program.cs
diff --git a/ReCodeIt_CLI/ReCodeIt.csproj b/ReCodeItCLI/ReCodeIt.csproj
similarity index 100%
rename from ReCodeIt_CLI/ReCodeIt.csproj
rename to ReCodeItCLI/ReCodeIt.csproj
diff --git a/RecodeIt.sln b/RecodeIt.sln
index b8cd12e..e6edcaf 100644
--- a/RecodeIt.sln
+++ b/RecodeIt.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItGUI", "RecodeItGUI\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeItLib", "RecodeItLib\ReCodeItLib.csproj", "{FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReCodeIt", "ReCodeIt_CLI\ReCodeIt.csproj", "{7DC1B062-C286-421B-B918-A56D5D7F2AE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReCodeIt", "ReCodeItCLI\ReCodeIt.csproj", "{E404EC0B-06D2-4964-8ABA-A634F259655C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,26 +63,26 @@ Global
 		{FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x64.Build.0 = Release|Any CPU
 		{FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x86.ActiveCfg = Release|Any CPU
 		{FDA58DB6-E114-4FE0-AAF1-C3DEE44AEF99}.Release|x86.Build.0 = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|x64.Build.0 = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Debug|x86.Build.0 = Debug|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|ARM.Build.0 = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|ARM64.Build.0 = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|x64.ActiveCfg = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|x64.Build.0 = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|x86.ActiveCfg = Release|Any CPU
-		{7DC1B062-C286-421B-B918-A56D5D7F2AE7}.Release|x86.Build.0 = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Debug|x86.Build.0 = Debug|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|ARM.Build.0 = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|ARM64.Build.0 = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|x64.Build.0 = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E404EC0B-06D2-4964-8ABA-A634F259655C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE