diff --git a/vars/FrameworkVars b/Framework-ConfigFiles/FrameworkVars
similarity index 100%
rename from vars/FrameworkVars
rename to Framework-ConfigFiles/FrameworkVars
diff --git a/vars/kv_map b/Framework-ConfigFiles/kv_map
similarity index 100%
rename from vars/kv_map
rename to Framework-ConfigFiles/kv_map
diff --git a/includes/DebugMe.sh b/Framework-Includes/DebugMe.sh
similarity index 100%
rename from includes/DebugMe.sh
rename to Framework-Includes/DebugMe.sh
diff --git a/includes/ErrorHandling.sh b/Framework-Includes/ErrorHandling.sh
similarity index 100%
rename from includes/ErrorHandling.sh
rename to Framework-Includes/ErrorHandling.sh
diff --git a/includes/LocalHelp.sh b/Framework-Includes/LocalHelp.sh
similarity index 100%
rename from includes/LocalHelp.sh
rename to Framework-Includes/LocalHelp.sh
diff --git a/includes/Logging.sh b/Framework-Includes/Logging.sh
similarity index 100%
rename from includes/Logging.sh
rename to Framework-Includes/Logging.sh
diff --git a/includes/LookupKv.sh b/Framework-Includes/LookupKv.sh
similarity index 100%
rename from includes/LookupKv.sh
rename to Framework-Includes/LookupKv.sh
diff --git a/includes/PreflightCheck.sh b/Framework-Includes/PreflightCheck.sh
similarity index 100%
rename from includes/PreflightCheck.sh
rename to Framework-Includes/PreflightCheck.sh
diff --git a/includes/PrettyPrint.sh b/Framework-Includes/PrettyPrint.sh
similarity index 100%
rename from includes/PrettyPrint.sh
rename to Framework-Includes/PrettyPrint.sh
diff --git a/project.sh b/project.sh
index d1fbc24..6536ac8 100644
--- a/project.sh
+++ b/project.sh
@@ -1,7 +1,20 @@
 #!/bin/bash
 
+export FRAMEWORK_INCLUDES_FULL_PATH
+FRAMEWORK_INCLUDES_FULL_PATH="$(realpath ./Framework-Includes)"
+
+export FRAMEWORK_CONFIGS_FULL_PATH
+FRAMEWORK_CONFIGS_FULL_PATH="$(realpath ./Framework-ConfigFiles)"
+
+export PROJECT_INCLUDES_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ./Project-Includes)"
+
+export PROJECT_CONGIGS_FULL_PATH
+PROJECT_INCLUDES_FULL_PATH="$(realpath ./Project-ConfigFiles)"
+
+
 #Framework variables are read from hee
-source vars/FrameworkVars
+source $VARS_FULL_PATH/FrameworkVars
 
 #Boilerplate and support functions
 FrameworkIncludeFiles="$(ls -1 --color=none includes/*)"