diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cc3f9a..ed52939 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ CPMAddPackage(
 CPMAddPackage(
   NAME nlohmann_json
   GITHUB_REPOSITORY nlohmann/json
-  GIT_TAG origin/master
+  GIT_TAG v3.11.3
   OPTIONS
   "BUILD_STATIC_LIBS ON"
   "JSON_BuildTests OFF"
diff --git a/src/Command/Actions/New.cpp b/src/Command/Actions/New.cpp
index 423ee43..78b92a8 100644
--- a/src/Command/Actions/New.cpp
+++ b/src/Command/Actions/New.cpp
@@ -7,6 +7,7 @@
 #include <Frate/Wizards.hpp>
 #include <Frate/Project.hpp>
 #include <git2.h>
+#include <Frate/Command/Actions/Help.hpp>
 
 namespace Frate::Command::New {
 using std::filesystem::path;
diff --git a/src/Test/Commands/Author/TestAddMultiple.cpp b/src/Test/Commands/Author/TestAddMultiple.cpp
index 08b8781..db5f77c 100644
--- a/src/Test/Commands/Author/TestAddMultiple.cpp
+++ b/src/Test/Commands/Author/TestAddMultiple.cpp
@@ -1,5 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
+#include <Frate/Project.hpp>
 
 
 namespace Tests::Command {
diff --git a/src/Test/Commands/Author/TestAddSingle.cpp b/src/Test/Commands/Author/TestAddSingle.cpp
index 27fd282..3f4ef80 100644
--- a/src/Test/Commands/Author/TestAddSingle.cpp
+++ b/src/Test/Commands/Author/TestAddSingle.cpp
@@ -1,6 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
-
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   bool testAddAuthorSingle(std::string name){
diff --git a/src/Test/Commands/Author/TestRemoveAuthor.cpp b/src/Test/Commands/Author/TestRemoveAuthor.cpp
index 1df600a..0d00322 100644
--- a/src/Test/Commands/Author/TestRemoveAuthor.cpp
+++ b/src/Test/Commands/Author/TestRemoveAuthor.cpp
@@ -1,6 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
-
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   bool testRemoveAuthor(std::string name){
diff --git a/src/Test/Commands/Flags/TestAddFlagMultiple.cpp b/src/Test/Commands/Flags/TestAddFlagMultiple.cpp
index 4bc7be0..795d2f6 100644
--- a/src/Test/Commands/Flags/TestAddFlagMultiple.cpp
+++ b/src/Test/Commands/Flags/TestAddFlagMultiple.cpp
@@ -1,6 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
-
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   bool testAddFlagsMultiple(){
diff --git a/src/Test/Commands/Flags/TestAddFlagSingle.cpp b/src/Test/Commands/Flags/TestAddFlagSingle.cpp
index ce42ff9..5b0b64b 100644
--- a/src/Test/Commands/Flags/TestAddFlagSingle.cpp
+++ b/src/Test/Commands/Flags/TestAddFlagSingle.cpp
@@ -1,6 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
-
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   bool testAddFlagsSingle(){
diff --git a/src/Test/Commands/Flags/TestAddFlagWithMode.cpp b/src/Test/Commands/Flags/TestAddFlagWithMode.cpp
index 8415bf5..eb75d8d 100644
--- a/src/Test/Commands/Flags/TestAddFlagWithMode.cpp
+++ b/src/Test/Commands/Flags/TestAddFlagWithMode.cpp
@@ -1,5 +1,6 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
+#include <Frate/Project.hpp>
 
 
 namespace Tests::Command {
diff --git a/src/Test/Commands/Mode/TestAddModeSingle.cpp b/src/Test/Commands/Mode/TestAddModeSingle.cpp
index 63531e9..543bee1 100644
--- a/src/Test/Commands/Mode/TestAddModeSingle.cpp
+++ b/src/Test/Commands/Mode/TestAddModeSingle.cpp
@@ -1,6 +1,7 @@
+#ifdef TEST
 #include "Frate/Test/Test.hpp"
 #include "nlohmann/json_fwd.hpp"
-#ifdef TEST
+#include <Frate/Project.hpp>
 
 bool Tests::Command::testAddMode(std::string mode_name){
   Frate::Utils::info << "Testing add mode command normal conditions" << std::endl;
diff --git a/src/Test/Commands/New/TestWithLang.cpp b/src/Test/Commands/New/TestWithLang.cpp
index 543d7b3..7851e6e 100644
--- a/src/Test/Commands/New/TestWithLang.cpp
+++ b/src/Test/Commands/New/TestWithLang.cpp
@@ -1,6 +1,8 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
 #include <Frate/Utils/General.hpp>
+#include <Frate/Project.hpp>
+
 bool Tests::Command::testNewWithLang(std::string lang){
 
   Frate::Utils::info << "Testing new command with lang: " << lang << std::endl;
diff --git a/src/Test/Commands/New/TestWithType.cpp b/src/Test/Commands/New/TestWithType.cpp
index ac4479f..5fc5168 100644
--- a/src/Test/Commands/New/TestWithType.cpp
+++ b/src/Test/Commands/New/TestWithType.cpp
@@ -1,6 +1,7 @@
 #ifdef TEST
-#include "Frate/Utils/General.hpp"
 #include <Frate/Test/Test.hpp>
+#include <Frate/Project.hpp>
+
 bool Tests::Command::testNewWithType(std::string type){
   Frate::Utils::info << "Testing new command with type: " << type << std::endl;
   test_path = genTestDirectory(); 
diff --git a/src/Test/Commands/Package/TestAddPackageMultiple.cpp b/src/Test/Commands/Package/TestAddPackageMultiple.cpp
index c916e67..eaa9143 100644
--- a/src/Test/Commands/Package/TestAddPackageMultiple.cpp
+++ b/src/Test/Commands/Package/TestAddPackageMultiple.cpp
@@ -1,6 +1,6 @@
 #ifdef TEST
-#include "Frate/Command.hpp"
 #include <Frate/Test/Test.hpp>
+#include <Frate/Project.hpp>
 
 bool Tests::Command::testAddPackageMultiple(std::vector<std::string> packages) {
   std::cout << "Testing add multiple packages : adding ";
diff --git a/src/Test/Commands/Package/TestAddPackageWithMode.cpp b/src/Test/Commands/Package/TestAddPackageWithMode.cpp
index cfff0d5..1272fe7 100644
--- a/src/Test/Commands/Package/TestAddPackageWithMode.cpp
+++ b/src/Test/Commands/Package/TestAddPackageWithMode.cpp
@@ -1,5 +1,7 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
+#include <Frate/Package.hpp>
+#include <Frate/Project.hpp>
 bool Tests::Command::testAddPackageToMode(std::string mode_name, std::string package_name){
   using nlohmann::json;
   std::cout << "Testing add package to mode command" << std::endl;
diff --git a/src/Test/Commands/Package/TestRemovePackageMultiple.cpp b/src/Test/Commands/Package/TestRemovePackageMultiple.cpp
index 185758f..498397f 100644
--- a/src/Test/Commands/Package/TestRemovePackageMultiple.cpp
+++ b/src/Test/Commands/Package/TestRemovePackageMultiple.cpp
@@ -1,6 +1,7 @@
 #ifdef TEST
 #include <Frate/Test/Test.hpp>
-
+#include <Frate/Package.hpp>
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   bool testRemovePackageMultiple(std::vector<std::string> packages){
diff --git a/src/Test/Commands/TestCommandUtils.cpp b/src/Test/Commands/TestCommandUtils.cpp
index 27974de..a12ea31 100644
--- a/src/Test/Commands/TestCommandUtils.cpp
+++ b/src/Test/Commands/TestCommandUtils.cpp
@@ -4,6 +4,7 @@
 #include <Frate/Command.hpp>
 #include <filesystem>
 #include <memory>
+#include <Frate/Project.hpp>
 
 namespace Tests::Command {
   using std::filesystem::path;
diff --git a/src/Test/Commands/TestValidateProjectJson.cpp b/src/Test/Commands/TestValidateProjectJson.cpp
index 8aa29b1..ff02f22 100644
--- a/src/Test/Commands/TestValidateProjectJson.cpp
+++ b/src/Test/Commands/TestValidateProjectJson.cpp
@@ -1,15 +1,13 @@
 #ifdef TEST
 #include "Frate/Command.hpp"
-#include "Frate/Utils/General.hpp"
 #include <catch2/catch_test_macros.hpp>
 #include <Frate/Test/Test.hpp>
+#include <Frate/Project.hpp>
 
 
 namespace Tests::Command {
   using Frate::Command::Interface;
   bool validateProjectJson(std::shared_ptr<Interface> inter){
-    Frate::Utils::Error error;
-    Frate::Utils::Info info;
     bool valid = true;
     Frate::Utils::info << "Testing valid project json" << std::endl;