diff --git a/.gitignore b/.gitignore
index dcb442d..417798a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ packages
 bin
 obj
 build
-makeP.bat
\ No newline at end of file
+old
+*user.bat
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..44c3e6c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ComputeEngine"]
+	path = ComputeEngine
+	url = https://github.com/DawidPietrykowski/ComputeEngine
diff --git a/ComputeEngine b/ComputeEngine
new file mode 160000
index 0000000..c89dda2
--- /dev/null
+++ b/ComputeEngine
@@ -0,0 +1 @@
+Subproject commit c89dda21e209cd8284d44f27a666aeab2c3db096
diff --git a/README.md b/README.md
index 9e21481..8d0ba94 100644
--- a/README.md
+++ b/README.md
@@ -10,17 +10,19 @@ GPU Ray Tracing application based on my OpenGL Compute Engine.
 * GLFW
 * GLEW
 * [stb_image](https://github.com/nothings/stb)
-* [OpenGL Compute Engine](https://github.com/DawidPietrykowski/ComputeEngine)
 
 ## Build
 
-Specify these root directories for dependencies in [make.bat](make.bat) script:
-* GLFW_ROOT
-* GLEW_ROOT
-* stb_image_ROOT
-* ComputeEngine_ROOT
+* Clone this directory
+* Run git submodule init 
+* Run git submodule update 
+* Specify these root directories for dependencies in [make_all.bat](make_all.bat) script:
+    * GLFW_ROOT
+    * GLEW_ROOT
+    * stb_image_ROOT
 
-Run [make.bat](make.bat) script.
+* Run [make_all.bat](make_all.bat).
+* Run [build.bat](build.bat).
 
 ## Config files
 
diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..b4ae87f
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,8 @@
+@echo off 
+
+set GLFW_ROOT=
+set GLEW_ROOT=
+set stb_image_ROOT=
+set ComputeEngine_ROOT=%CD%/ComputeEngine
+
+cmake --build build --config Release
\ No newline at end of file
diff --git a/make.bat b/make.bat
deleted file mode 100644
index 2aff2b0..0000000
--- a/make.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off 
-
-set GLFW_ROOT=
-set GLEW_ROOT=
-set stb_image_ROOT=
-set ComputeEngine_ROOT=
-
-cmake -B build -S . -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT% -DComputeEngine_ROOT=%ComputeEngine_ROOT%
\ No newline at end of file
diff --git a/make_all.bat b/make_all.bat
new file mode 100644
index 0000000..01e8af2
--- /dev/null
+++ b/make_all.bat
@@ -0,0 +1,10 @@
+@echo off 
+
+set GLFW_ROOT=
+set GLEW_ROOT=
+set stb_image_ROOT=
+set ComputeEngine_ROOT=%CD%/ComputeEngine
+
+cmake -B ComputeEngine/build -S ComputeEngine -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT%
+cmake --build ComputeEngine/build --config Release
+cmake -B build -S . -DGLFW_ROOT=%GLFW_ROOT% -DGLEW_ROOT=%GLEW_ROOT% -Dstb_image_ROOT=%stb_image_ROOT% -DComputeEngine_ROOT=%ComputeEngine_ROOT%
\ No newline at end of file
diff --git a/remake.bat b/remake.bat
deleted file mode 100644
index 5b690da..0000000
--- a/remake.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-rmdir /s /q build
-make.bat
\ No newline at end of file