diff --git a/engine/Doxyfile b/engine/Doxyfile
index df51bff..5257ef7 100644
--- a/engine/Doxyfile
+++ b/engine/Doxyfile
@@ -7,8 +7,7 @@ EXTRACT_ALL = NO
 RECURSIVE = YES
 
 FILE_PATTERNS = *.c *.h
-INPUT = . include graphic README.md
-EXCLUDE_PATTERNS = external
+INPUT = src include graphic README.md
 
 SOURCE_BROWSER = YES
 HTML_DYNAMIC_MENUS = YES
@@ -16,7 +15,7 @@ GENERATE_TREEVIEW = YES
 FULL_SIDEBAR = NO
 DISABLE_INDEX = NO
 HAVE_DOT = NO
-PROJECT_LOGO = "goldfish.png"
+PROJECT_LOGO = "images/goldfish.png"
 PROJECT_BRIEF = "Quite simple and lightweight game engine"
 GENERATE_MAN = NO
 USE_MDFILE_AS_MAINPAGE = "README.md"
diff --git a/engine/premake5.lua b/engine/premake5.lua
index 28491e3..8cf24b6 100644
--- a/engine/premake5.lua
+++ b/engine/premake5.lua
@@ -254,157 +254,7 @@ function gf_msvc_filters()
 end
 
 include("util")
-
-project("GoldFish")
-	filter("options:engine=static")
-		kind("StaticLib")
-		defines({
-			"ODE_LIB",
-			"GF_LIB"
-		})
-	filter("options:engine=dynamic")
-		kind("SharedLib")
-		defines({
-			"ODE_DLL",
-			"GF_DLL"
-		})
-	filter("configurations:Debug")
-		defines({
-			"DEBUG",
-			"_DEBUG"
-		})
-		symbols("On")
-	filter("configurations:Release")
-		defines({
-			"NDEBUG",
-			"dNODEBUG"
-		})
-		optimize("On")
-	gf_msvc_filters()
-	targetdir("lib/%{cfg.buildcfg}/%{cfg.platform}")
-	objdir("obj")
-	targetname("goldfish")
-	includedirs({
-		"include",
-		"external/lua",
-		"external/zlib",
-		"external/miniaudio",
-		"external/stb",
-		"external/jar",
-	})
-	files({
-		"include/**.h",
-		"src/*.c",
-		"external/zlib/*.h",
-		"external/zlib/*.c",
-		"external/lua/l*.h",
-		"external/lua/l*.c",
-	})
-	files({
-		"src/audio/*.c"
-	})
-	filter({
-		"system:windows",
-		"options:engine=dynamic"
-	})
-		files({
-			"src/engine.rc"
-		})
-	filter({})
-	removefiles({
-		"external/lua/ltests.c",
-		"external/lua/ltests.h"
-	})
-	removefiles({
-		"external/lua/lua.c"
-	})
-
-	filter("system:windows")
-		files({
-			"src/thread/win32/gf_thread.c"
-		})
-	filter("system:not windows")
-		files({
-			"src/thread/posix/gf_thread.c"
-		})
-	filter({})
-
-	-- Begin ODE
-	includedirs({
-		"external/ode/include",
-		"external/ode/ode/src",
-		"external/ode/ode/src/joints",
-		"external/ode/OPCODE",
-		"external/ode/GIMPACT/include",
-		"external/ode/libccd/src/custom",
-		"external/ode/libccd/src"
-	})
-	files({
-		"external/ode/include/ode/*.h",
-		"external/ode/ode/src/joints/*.h",
-		"external/ode/ode/src/joints/*.cpp",
-		"external/ode/ode/src/*.h",
-		"external/ode/ode/src/*.c",
-		"external/ode/ode/src/*.cpp"
-	})
-	removefiles({
-		"external/ode/ode/src/collision_trimesh_trimesh_old.cpp",
-		"external/ode/ode/src/collision_trimesh_opcode.cpp",
-		"external/ode/ode/src/collision_trimesh_disabled.cpp"
-	})
-
-	includedirs({
-		"external/ode/ou/include"
-	})
-	files({
-		"external/ode/ou/include/**.h",
-		"external/ode/ou/src/**.h",
-		"external/ode/ou/src/**.cpp"
-	})
-	defines({
-		"_OU_NAMESPACE=odeou",
-		"_OU_FEATURE_SET=_OU_FEATURE_SET_TLS"
-	})
-
-	files({
-		"external/ode/GIMPACT/**.h",
-		"external/ode/GIMPACT/**.cpp"
-	})
-
-	files({
-		"external/ode/libccd/src/custom/ccdcustom/*.h",
-		"external/ode/libccd/src/ccd/*.h",
-		"external/ode/libccd/src/*.c"
-	})
-
-	defines({
-		"dLIBCCD_ENABLED",
-		"dLIBCCD_INTERNAL",
-		"dLIBCCD_BOX_CYL",
-		"dLIBCCD_CYL_CYL",
-		"dLIBCCD_CAP_CYL",
-		"dLIBCCD_CONVEX_BOX",
-		"dLIBCCD_CONVEX_CAP",
-		"dLIBCCD_CONVEX_CYL",
-		"dLIBCCD_CONVEX_SPHERE",
-		"dLIBCCD_CONVEX_CONVEX"
-	})
-	-- End ODE
-
-	gf_default_stuffs()
-	gf_link_stuffs("options:engine=dynamic")
-	for k,v in pairs(gf_backends) do
-		for k2,v2 in pairs(v["backends"]) do
-			filter({
-				"options:backend=" .. k,
-				"options:" .. k .. "=" .. k2
-			})
-				files({
-					"src/graphic/" .. k .. "/*.c",
-					"src/graphic/" .. k .. "/" .. k2 .. "/*.c"
-				})
-		end
-	end
+include("src")
 
 if _ACTION and _ACTION ~= "clean" then
 	local text = ""
diff --git a/engine/src/premake5.lua b/engine/src/premake5.lua
new file mode 100644
index 0000000..2f9a522
--- /dev/null
+++ b/engine/src/premake5.lua
@@ -0,0 +1,150 @@
+project("GoldFish")
+	filter("options:engine=static")
+		kind("StaticLib")
+		defines({
+			"ODE_LIB",
+			"GF_LIB"
+		})
+	filter("options:engine=dynamic")
+		kind("SharedLib")
+		defines({
+			"ODE_DLL",
+			"GF_DLL"
+		})
+	filter("configurations:Debug")
+		defines({
+			"DEBUG",
+			"_DEBUG"
+		})
+		symbols("On")
+	filter("configurations:Release")
+		defines({
+			"NDEBUG",
+			"dNODEBUG"
+		})
+		optimize("On")
+	gf_msvc_filters()
+	targetdir("../lib/%{cfg.buildcfg}/%{cfg.platform}")
+	objdir("../obj")
+	targetname("goldfish")
+	includedirs({
+		"../include",
+		"../external/lua",
+		"../external/zlib",
+		"../external/miniaudio",
+		"../external/stb",
+		"../external/jar",
+	})
+	files({
+		"../include/**.h",
+		"*.c",
+		"../external/zlib/*.h",
+		"../external/zlib/*.c",
+		"../external/lua/l*.h",
+		"../external/lua/l*.c",
+	})
+	files({
+		"audio/*.c"
+	})
+	filter({
+		"system:windows",
+		"options:engine=dynamic"
+	})
+		files({
+			"engine.rc"
+		})
+	filter({})
+	removefiles({
+		"../external/lua/ltests.c",
+		"../external/lua/ltests.h"
+	})
+	removefiles({
+		"../external/lua/lua.c"
+	})
+
+	filter("system:windows")
+		files({
+			"thread/win32/gf_thread.c"
+		})
+	filter("system:not windows")
+		files({
+			"thread/posix/gf_thread.c"
+		})
+	filter({})
+
+	-- Begin ODE
+	includedirs({
+		"../external/ode/include",
+		"../external/ode/ode/src",
+		"../external/ode/ode/src/joints",
+		"../external/ode/OPCODE",
+		"../external/ode/GIMPACT/include",
+		"../external/ode/libccd/src/custom",
+		"../external/ode/libccd/src"
+	})
+	files({
+		"../external/ode/include/ode/*.h",
+		"../external/ode/ode/src/joints/*.h",
+		"../external/ode/ode/src/joints/*.cpp",
+		"../external/ode/ode/src/*.h",
+		"../external/ode/ode/src/*.c",
+		"../external/ode/ode/src/*.cpp"
+	})
+	removefiles({
+		"../external/ode/ode/src/collision_trimesh_trimesh_old.cpp",
+		"../external/ode/ode/src/collision_trimesh_opcode.cpp",
+		"../external/ode/ode/src/collision_trimesh_disabled.cpp"
+	})
+
+	includedirs({
+		"../external/ode/ou/include"
+	})
+	files({
+		"../external/ode/ou/include/**.h",
+		"../external/ode/ou/src/**.h",
+		"../external/ode/ou/src/**.cpp"
+	})
+	defines({
+		"_OU_NAMESPACE=odeou",
+		"_OU_FEATURE_SET=_OU_FEATURE_SET_TLS"
+	})
+
+	files({
+		"../external/ode/GIMPACT/**.h",
+		"../external/ode/GIMPACT/**.cpp"
+	})
+
+	files({
+		"../external/ode/libccd/src/custom/ccdcustom/*.h",
+		"../external/ode/libccd/src/ccd/*.h",
+		"../external/ode/libccd/src/*.c"
+	})
+
+	defines({
+		"dLIBCCD_ENABLED",
+		"dLIBCCD_INTERNAL",
+		"dLIBCCD_BOX_CYL",
+		"dLIBCCD_CYL_CYL",
+		"dLIBCCD_CAP_CYL",
+		"dLIBCCD_CONVEX_BOX",
+		"dLIBCCD_CONVEX_CAP",
+		"dLIBCCD_CONVEX_CYL",
+		"dLIBCCD_CONVEX_SPHERE",
+		"dLIBCCD_CONVEX_CONVEX"
+	})
+	-- End ODE
+
+	gf_default_stuffs()
+	gf_link_stuffs("options:engine=dynamic")
+	for k,v in pairs(gf_backends) do
+		for k2,v2 in pairs(v["backends"]) do
+			filter({
+				"options:backend=" .. k,
+				"options:" .. k .. "=" .. k2
+			})
+				files({
+					"graphic/" .. k .. "/*.c",
+					"graphic/" .. k .. "/" .. k2 .. "/*.c"
+				})
+		end
+	end
diff --git a/internal/goldfish.bmp b/internal/goldfish.bmp
deleted file mode 100644
index 3076e88..0000000
Binary files a/internal/goldfish.bmp and /dev/null differ
diff --git a/internal/goldfish.ico b/internal/goldfish.ico
deleted file mode 100644
index 4a71897..0000000
Binary files a/internal/goldfish.ico and /dev/null differ
diff --git a/src/nishbox.rc b/src/nishbox.rc
index 3a384bc..483ab2b 100644
--- a/src/nishbox.rc
+++ b/src/nishbox.rc
@@ -8,7 +8,6 @@
 #endif
 
 GAME ICON "./internal/icon.ico"
-GOLDFISH_BMP BITMAP "./internal/goldfish.bmp"
 
 VS_VERSION_INFO VERSIONINFO
         FILEVERSION 0,0,0,0