diff --git a/Editor/Source/Editor/EditorApplication.cpp b/Editor/Source/Editor/EditorApplication.cpp
index 447145ae..05d3c1b2 100644
--- a/Editor/Source/Editor/EditorApplication.cpp
+++ b/Editor/Source/Editor/EditorApplication.cpp
@@ -8,17 +8,13 @@
 #include "Nuake/UI/NuakeUI.h"
 #include "Nuake/UI/UIInputManager.h"
 
-#include "Nuake/Resource/Bakers/AssetBakerManager.h"
-#include "Nuake/Resource/Bakers/GLTFBaker.h"
-
 void EditorApplication::OnInit()
 {
     using namespace Nuake;
     Engine::Init();
 	
 	// Register bakers, these can convert files into nuake resources
-	AssetBakerManager& assetBakerMgr = AssetBakerManager::Get();
-	assetBakerMgr.RegisterBaker(CreateRef<GLTFBaker>());
+	
 	
     m_Window = Engine::GetCurrentWindow();
     m_Window->SetSize({ m_Specification.WindowWidth, m_Specification.WindowHeight });
diff --git a/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.cpp b/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.cpp
new file mode 100644
index 00000000..b8f4df44
--- /dev/null
+++ b/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.cpp
@@ -0,0 +1,18 @@
+#include "AssimpModule.h"
+
+#include "Nuake/Resource/Bakers/AssetBakerManager.h"
+
+#include "GLTFBaker.h"
+
+void AssimpModule_Startup()
+{
+	using namespace Nuake;
+
+	AssetBakerManager& assetBakerMgr = AssetBakerManager::Get();
+	assetBakerMgr.RegisterBaker(CreateRef<GLTFBaker>());
+}
+
+void AssimpModule_Shutdown()
+{
+
+}
\ No newline at end of file
diff --git a/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.h b/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.h
new file mode 100644
index 00000000..099f8536
--- /dev/null
+++ b/Nuake/Source/Nuake/Modules/AssimpModule/AssimpModule.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void AssimpModule_Startup();
+void AssimpModule_Shutdown();
\ No newline at end of file
diff --git a/Nuake/Source/Nuake/Resource/Bakers/GLTFBaker.cpp b/Nuake/Source/Nuake/Modules/AssimpModule/GLTFBaker.cpp
similarity index 100%
rename from Nuake/Source/Nuake/Resource/Bakers/GLTFBaker.cpp
rename to Nuake/Source/Nuake/Modules/AssimpModule/GLTFBaker.cpp
diff --git a/Nuake/Source/Nuake/Resource/Bakers/GLTFBaker.h b/Nuake/Source/Nuake/Modules/AssimpModule/GLTFBaker.h
similarity index 95%
rename from Nuake/Source/Nuake/Resource/Bakers/GLTFBaker.h
rename to Nuake/Source/Nuake/Modules/AssimpModule/GLTFBaker.h
index b6450e26..1c28b0f8 100644
--- a/Nuake/Source/Nuake/Resource/Bakers/GLTFBaker.h
+++ b/Nuake/Source/Nuake/Modules/AssimpModule/GLTFBaker.h
@@ -1,4 +1,4 @@
-#include "IAssetBaker.h"
+#include "Nuake/Resource/Bakers/IAssetBaker.h"
 
 #include "Nuake/Rendering/Vertex.h"
 
diff --git a/Nuake/Source/Nuake/Modules/AssimpModule/Module.lua b/Nuake/Source/Nuake/Modules/AssimpModule/Module.lua
new file mode 100644
index 00000000..b2d4add7
--- /dev/null
+++ b/Nuake/Source/Nuake/Modules/AssimpModule/Module.lua
@@ -0,0 +1,11 @@
+return {
+    name = "Assimp Module",
+    description = "Assimp asset resolver module",
+    module_header = "AssimpModule.h",
+    -- Place all your sources here
+    sources = {
+        "AssimpModule.cpp",
+        "GLTFBaker.h",
+        "GLTFBaker.cpp",
+    }
+}
\ No newline at end of file
diff --git a/Nuake/Source/Nuake/Modules/Modules.cpp b/Nuake/Source/Nuake/Modules/Modules.cpp
index 638281e0..3bde3497 100644
--- a/Nuake/Source/Nuake/Modules/Modules.cpp
+++ b/Nuake/Source/Nuake/Modules/Modules.cpp
@@ -1,18 +1,23 @@
 // Auto-generated modules management file
 #include "Modules.h"
 
+#include "AssimpModule/AssimpModule.h"
 #include "ExampleModule/ExampleModule.h"
 
 #include "Nuake/Core/Logger.h"
 
 void Nuake::Modules::StartupModules()
 {
+    Logger::Log("Starting AssimpModule", "modules");
+    AssimpModule_Startup();
     Logger::Log("Starting ExampleModule", "modules");
     ExampleModule_Startup();
 }
 
 void Nuake::Modules::ShutdownModules()
 {
+    Logger::Log("Shutting down AssimpModule", "modules");
+    AssimpModule_Shutdown();
     Logger::Log("Shutting down ExampleModule", "modules");
     ExampleModule_Shutdown();
 }