diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55913ab..a60dc7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8.0)
 project(Prisma-client VERSION 0.1.0)
 add_subdirectory(engine)
 set(CMAKE_CXX_STANDARD 17)
-add_executable(Prisma-client "main.cpp" "UserEngine/include/UserEngine.h" "UserEngine/src/UserEngine.cpp" "GUI/include/ImGuiStyle.h" "GUI/include/Postprocess/Effects.h" "GUI/src/Postprocess/Effects.cpp" "GUI/include/LightInfo.h" "GUI/src/LightInfo.cpp" "GUI/include/TextureInfo.h" "GUI/src/TextureInfo.cpp" "GUI/include/PixelCapture.h" "GUI/src/PixelCapture.cpp" "UserEngine/include/PlayerController.h" "UserEngine/src/PlayerController.cpp" "GUI/include/SettingsTab.h" "GUI/src/SettingsTab.cpp" "GUI/include/PlotFPS.h" "GUI/src/PlotFPS.cpp" "UserEngine/include/ParticleController.h" "UserEngine/src/ParticleController.cpp" "GUI/include/NodeViewer.h" "GUI/src/NodeViewer.cpp" "UserEngine/Components/include/GrassRenderer.h" "UserEngine/Components/src/GrassRenderer.cpp" "GUI/include/MeshCreator.h" "GUI/src/MeshCreator.cpp" "GUI/include/AddingMenu.h" "GUI/src/AddingMenu.cpp" "GUI/include/RegisterComponent.h" "GUI/include/RegisterCreator.h" "GUI/src/RegisterCreator.cpp")
+add_executable(Prisma-client "main.cpp" "UserEngine/include/UserEngine.h" "UserEngine/src/UserEngine.cpp" "GUI/include/ImGuiStyle.h" "GUI/include/Postprocess/Effects.h" "GUI/src/Postprocess/Effects.cpp" "GUI/include/LightInfo.h" "GUI/src/LightInfo.cpp" "GUI/include/TextureInfo.h" "GUI/src/TextureInfo.cpp" "GUI/include/PixelCapture.h" "GUI/src/PixelCapture.cpp" "UserEngine/include/PlayerController.h" "UserEngine/src/PlayerController.cpp" "GUI/include/SettingsTab.h" "GUI/src/SettingsTab.cpp" "GUI/include/PlotFPS.h" "GUI/src/PlotFPS.cpp" "UserEngine/include/ParticleController.h" "UserEngine/src/ParticleController.cpp" "GUI/include/NodeViewer.h" "GUI/src/NodeViewer.cpp" "UserEngine/Components/include/GrassRenderer.h" "UserEngine/Components/src/GrassRenderer.cpp" "GUI/include/MeshCreator.h" "GUI/src/MeshCreator.cpp" "GUI/include/AddingMenu.h" "GUI/src/AddingMenu.cpp" "Engine/include/Components/RegisterComponent.h" "Engine/include/Components/RegisterCreator.h" "Engine/src/Components/RegisterCreator.cpp")
 find_package(glm CONFIG REQUIRED)
 
 target_link_libraries(Prisma-client PRIVATE PrismaEngineDll glm::glm)
diff --git a/GUI/include/RegisterComponent.h b/Engine/include/Components/RegisterComponent.h
similarity index 95%
rename from GUI/include/RegisterComponent.h
rename to Engine/include/Components/RegisterComponent.h
index 19ece2a..b5f98a1 100644
--- a/GUI/include/RegisterComponent.h
+++ b/Engine/include/Components/RegisterComponent.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <functional>
 #include <string>
-#include "../../Engine/include/Components/Component.h"
+#include "Component.h"
 
 namespace Prisma
 {
diff --git a/Engine/include/Components/RegisterCreator.h b/Engine/include/Components/RegisterCreator.h
new file mode 100644
index 0000000..122d348
--- /dev/null
+++ b/Engine/include/Components/RegisterCreator.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "RegisterComponent.h"
+
+namespace Prisma
+{
+	class RegisterData
+	{
+	public:
+		void init();
+	};
+}
diff --git a/GUI/src/RegisterCreator.cpp b/Engine/src/Components/RegisterCreator.cpp
similarity index 54%
rename from GUI/src/RegisterCreator.cpp
rename to Engine/src/Components/RegisterCreator.cpp
index 9945627..d7f47b1 100644
--- a/GUI/src/RegisterCreator.cpp
+++ b/Engine/src/Components/RegisterCreator.cpp
@@ -1,4 +1,8 @@
-#include "../include/RegisterCreator.h"
+#include "../../include/Components/RegisterCreator.h"
+#include "../../include/Components/PhysicsMeshComponent.h"
+#include "../../include/Components/CloudComponent.h"
+#include "../../include/Components/CullingComponent.h"
+
 
 void Prisma::RegisterData::init()
 {
diff --git a/GUI/include/ImGuiDebug.h b/GUI/include/ImGuiDebug.h
index e68c425..de5088d 100644
--- a/GUI/include/ImGuiDebug.h
+++ b/GUI/include/ImGuiDebug.h
@@ -13,7 +13,7 @@
 #include "../../Engine/include/GlobalData/InstanceData.h"
 #include "../../Engine/include/Helpers/TimeCounter.h"
 #include "AddingMenu.h"
-#include "RegisterCreator.h"
+#include "../../Engine/include/Components/RegisterCreator.h"
 
 
 namespace Prisma
diff --git a/GUI/include/RegisterCreator.h b/GUI/include/RegisterCreator.h
deleted file mode 100644
index 1b3ad3f..0000000
--- a/GUI/include/RegisterCreator.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "RegisterComponent.h"
-#include "../../Engine/include/Components/PhysicsMeshComponent.h"
-#include "../../Engine/include/Components/CloudComponent.h"
-#include "../../Engine/include/Components/CullingComponent.h"
-
-namespace Prisma
-{
-	class RegisterData
-	{
-	public:
-		void init();
-	};
-}
diff --git a/GUI/src/NodeViewer.cpp b/GUI/src/NodeViewer.cpp
index 8566677..f2fa6a3 100644
--- a/GUI/src/NodeViewer.cpp
+++ b/GUI/src/NodeViewer.cpp
@@ -1,5 +1,6 @@
 #include "../include/NodeViewer.h"
-#include "../include/RegisterComponent.h"
+#include "../../Engine/include/Components/Component.h"
+#include "../../Engine/include/Components/RegisterComponent.h"
 #include "../../Engine/include/GlobalData/GlobalData.h"
 
 void Prisma::NodeViewer::varsDispatcher(Component::ComponentType types, int index)