diff --git a/Dependencies.lua b/Dependencies.lua
index bb02c35e..5619b666 100644
--- a/Dependencies.lua
+++ b/Dependencies.lua
@@ -1 +1,13 @@
 IncludeDir = {}
+IncludeDir["assimp"] = "%{wks.location}/Dependencies/assimp/include/assimp"
+IncludeDir["imgui"] = "%{wks.location}/Dependencies/imgui"
+IncludeDir["imguizmo"] = "%{wks.location}/Dependencies/imguizmo"
+IncludeDir["imnodes"] = "%{wks.location}/Dependencies/imnodes"
+IncludeDir["msdf_atlas_gen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdf-atlas-gen"
+IncludeDir["msdfgen"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/msdf/msdfgen"
+IncludeDir["spdlog"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/spdlog/include/spdlog"
+IncludeDir["stb"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/stb"
+IncludeDir["tracy"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/tracy"
+IncludeDir["VMA"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/VMA/include"
+IncludeDir["yamlcpp"] = "%{wks.location}/SHADE_Engine_y2/Dependencies/yamlcpp/include"
+IncludeDir["VULKAN"] = "$(VULKAN_SDK)"
diff --git a/SHADE_Application/SHADE_Application.vcxproj b/SHADE_Application/SHADE_Application.vcxproj
index ef176bf2..e8f90dc7 100644
--- a/SHADE_Application/SHADE_Application.vcxproj
+++ b/SHADE_Application/SHADE_Application.vcxproj
@@ -60,7 +60,7 @@
       <PrecompiledHeaderFile>SBpch.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..\SHADE_Engine_y2\src;..\SHADE_Editor_y2\src;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -71,7 +71,6 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SHADE_Engine_y2.lib;SHADE_Editor_y2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -80,7 +79,7 @@
       <PrecompiledHeaderFile>SBpch.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..\SHADE_Engine_y2\src;..\SHADE_Editor_y2\src;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\SHADE_Engine\src;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -94,9 +93,13 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>SHADE_Engine_y2.lib;SHADE_Editor_y2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SHADE_Engine\SHADE_Engine.vcxproj">
+      <Project>{3F92E998-2BF5-783D-D47A-B1F3C0BC44C0}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/SHADE_Application/premake5.lua b/SHADE_Application/premake5.lua
index f672db0e..eb1ec7c4 100644
--- a/SHADE_Application/premake5.lua
+++ b/SHADE_Application/premake5.lua
@@ -22,8 +22,7 @@ project "SHADE_Application"
   {
     "%{IncludeDir.GLFW}",
     "%{IncludeDir.GLAD}",
-    "../SHADE_Engine_y2/src",
-    "../SHADE_Editor_y2/src",
+    "../SHADE_Engine/src",
     "src"
   }
     
@@ -34,8 +33,7 @@ project "SHADE_Application"
   
   links
   {
-    "SHADE_Engine_y2",
-    "SHADE_Editor_y2"
+    "SHADE_Engine"
   }
   
   postbuildcommands
diff --git a/SHADE_Engine/SHADE_Engine.vcxproj b/SHADE_Engine/SHADE_Engine.vcxproj
index 876a5e3b..600cb9b7 100644
--- a/SHADE_Engine/SHADE_Engine.vcxproj
+++ b/SHADE_Engine/SHADE_Engine.vcxproj
@@ -58,7 +58,7 @@
       <PrecompiledHeaderFile>SHpch.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>_LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <MinimalRebuild>false</MinimalRebuild>
@@ -71,7 +71,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <Lib>
-      <AdditionalDependencies>fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudioL_vc.lib;fmodL_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
@@ -81,7 +81,7 @@
       <PrecompiledHeaderFile>SHpch.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>_LIB;_GLFW_INCLUDE_NONE;MSDFGEN_USE_CPP11;_RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>src;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>src;..\Dependencies\assimp\include\assimp;..\Dependencies\imgui;..\Dependencies\imguizmo;..\Dependencies\imnodes;..\SHADE_Engine_y2\Dependencies\msdf\msdf-atlas-gen;..\SHADE_Engine_y2\Dependencies\msdf\msdfgen;..\SHADE_Engine_y2\Dependencies\spdlog\include\spdlog;..\SHADE_Engine_y2\Dependencies\stb;..\SHADE_Engine_y2\Dependencies\tracy;..\SHADE_Engine_y2\Dependencies\VMA\include;..\SHADE_Engine_y2\Dependencies\yamlcpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -97,7 +97,7 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <Lib>
-      <AdditionalDependencies>fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>yamlcpp.lib;msdfgen.lib;msdf-atlas-gen.lib;fmodstudio_vc.lib;fmod_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index c2439b8c..9dcfcd84 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -14,21 +14,24 @@ project "SHADE_Engine"
     "%{prj.location}/src/**.h",
     "%{prj.location}/src/**.c",
     "%{prj.location}/src/**.cpp",
-    "%{prj.location}/src/**.glsl"
+    "%{prj.location}/src/**.glsl",
+    "%{wks.location}/Dependencies/stb_image/**.cpp"
   }
   
   includedirs
   {
     "%{prj.location}/src",
-    "%{IncludeDir.GLFW}",
-    "%{IncludeDir.GLAD}",
-    "%{IncludeDir.stb_image}",
-    "%{IncludeDir.yaml_cpp}",
-    "%{IncludeDir.fmod}",
-    "%{IncludeDir.fmod_studio}",
-    "%{IncludeDir.Mono}",
-	  "%{IncludeDir.msdf_atlas_gen}",
-	  "%{IncludeDir.msdfgen}"
+    "%{IncludeDir.assimp}",
+    "%{IncludeDir.imgui}",
+    "%{IncludeDir.imguizmo}",
+    "%{IncludeDir.imnodes}",
+    "%{IncludeDir.msdf_atlas_gen}",
+    "%{IncludeDir.msdfgen}",
+    "%{IncludeDir.spdlog}",
+    "%{IncludeDir.stb}",
+    "%{IncludeDir.tracy}",
+    "%{IncludeDir.VMA}",
+    "%{IncludeDir.yamlcpp}",
   }
   
   libdirs
@@ -38,6 +41,9 @@ project "SHADE_Engine"
   
   links
   {
+    "yamlcpp",
+    "msdfgen",
+    "msdf-atlas-gen"
   }
   
   defines
diff --git a/premake5.lua b/premake5.lua
index b6229d90..e11636d4 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -17,8 +17,5 @@ workspace "SHADE"
 
   outputdir = "%{cfg.buildcfg}_%{cfg.architecture}"
   
-  group "Dependencies"
-  group ""
-  
   include "SHADE_Application"
   include "SHADE_Engine"
\ No newline at end of file