diff --git a/.gitignore b/.gitignore
index 059dbb9..73d68a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,8 @@
-target/
-Cargo.lock
+backend/target
+backend/Cargo.lock
 RenegadeX-Launcher.ini
+RenegadeX-Launcher.exe
 C:/
 .idea/
+.vs/
 RenegadeX-Launcher
-windows-target/release/
-windows-target/i686-pc-windows-gnu/
-windows-target/Renegade X Launcher.exe
-windows-target/RenegadeX-Launcher.ini
-windows-target/Cargo.lock
-windows-target/.rustc_info.json
-windows-target/RenX-Launcher.zip
diff --git a/windows-target/RenegadeX-folder-permissions.exe b/RenegadeX-folder-permissions.exe
similarity index 100%
rename from windows-target/RenegadeX-folder-permissions.exe
rename to RenegadeX-folder-permissions.exe
diff --git a/windows-target/SelfUpdateExecutor.exe b/SelfUpdateExecutor.exe
similarity index 100%
rename from windows-target/SelfUpdateExecutor.exe
rename to SelfUpdateExecutor.exe
diff --git a/Cargo.toml b/backend/Cargo.toml
similarity index 84%
rename from Cargo.toml
rename to backend/Cargo.toml
index 0a34fba..5df01b2 100644
--- a/Cargo.toml
+++ b/backend/Cargo.toml
@@ -3,7 +3,8 @@ name = "RenegadeX-Launcher"
 version = "0.9.31"
 authors = ["SonnyX"]
 edition = "2018"
-exclude = ["target-windows/**", "target/**", "dom", "dom/**"]
+build = "build.rs"
+include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
 tokio = { version = "1.4", features = ["full"] }
@@ -25,5 +26,9 @@ flexi_logger = "0.19"
 download-async = "0.10"
 async-trait = "0.1"
 
+[build-dependencies]
+embed-resource = "1.6"
+
 [profile.release]
+opt-level = 'z'
 lto = true
\ No newline at end of file
diff --git a/backend/Cross.toml b/backend/Cross.toml
new file mode 100644
index 0000000..559d260
--- /dev/null
+++ b/backend/Cross.toml
@@ -0,0 +1,2 @@
+[target."i686-pc-windows-gnu"]
+image = "rustembedded/cross:i686-pc-windows-gnu"
diff --git a/backend/build.rs b/backend/build.rs
new file mode 100644
index 0000000..afb2808
--- /dev/null
+++ b/backend/build.rs
@@ -0,0 +1,9 @@
+extern crate embed_resource;
+use std::env;
+
+
+fn main() {
+  if env::var("CARGO_CFG_TARGET_OS").unwrap().eq("windows") {
+    embed_resource::compile("manifest.rc");
+  }
+}
diff --git a/windows-target/manifest.rc b/backend/manifest.rc
similarity index 100%
rename from windows-target/manifest.rc
rename to backend/manifest.rc
diff --git a/windows-target/rx.ico b/backend/rx.ico
similarity index 100%
rename from windows-target/rx.ico
rename to backend/rx.ico
diff --git a/windows-target/rx.manifest b/backend/rx.manifest
similarity index 100%
rename from windows-target/rx.manifest
rename to backend/rx.manifest
diff --git a/src/configuration.rs b/backend/src/configuration.rs
similarity index 100%
rename from src/configuration.rs
rename to backend/src/configuration.rs
diff --git a/src/error-codes.rs b/backend/src/error-codes.rs
similarity index 100%
rename from src/error-codes.rs
rename to backend/src/error-codes.rs
diff --git a/src/error.rs b/backend/src/error.rs
similarity index 100%
rename from src/error.rs
rename to backend/src/error.rs
diff --git a/src/handler.rs b/backend/src/handler.rs
similarity index 100%
rename from src/handler.rs
rename to backend/src/handler.rs
diff --git a/src/main.rs b/backend/src/main.rs
similarity index 100%
rename from src/main.rs
rename to backend/src/main.rs
diff --git a/src/progress.rs b/backend/src/progress.rs
similarity index 100%
rename from src/progress.rs
rename to backend/src/progress.rs
diff --git a/src/spawn_wrapper.rs b/backend/src/spawn_wrapper.rs
similarity index 100%
rename from src/spawn_wrapper.rs
rename to backend/src/spawn_wrapper.rs
diff --git a/compile.bat b/compile.bat
new file mode 100644
index 0000000..f31b44d
--- /dev/null
+++ b/compile.bat
@@ -0,0 +1,5 @@
+cd backend
+cross build --release --target=i686-pc-windows-gnu
+cd ..
+echo F|xcopy /Y backend\target\i686-pc-windows-gnu\release\RenegadeX-Launcher.exe RenegadeX-Launcher.exe
+pause
\ No newline at end of file
diff --git a/create-symlink-for-theme.sh b/create-symlink-for-theme.sh
deleted file mode 100755
index 024d7d7..0000000
--- a/create-symlink-for-theme.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-echo "Name theme to create symlink for:"
-read theme
-if [ $( ls -1tqd "$(pwd)/$theme" | wc -l ) == "1" ]
-then
-  ln -s "$(pwd)/$theme" "$(pwd)/target/release/$theme" 2>/dev/null
-  ln -s "$(pwd)/$theme" "$(pwd)/target/debug/$theme" 2>/dev/null
-else
-  echo "There is no theme named \"$theme\" in your current folder"
-fi
diff --git a/windows-target/sciter.dll b/sciter.dll
similarity index 100%
rename from windows-target/sciter.dll
rename to sciter.dll
diff --git a/windows-target/Cargo.toml b/windows-target/Cargo.toml
deleted file mode 100644
index 00a9146..0000000
--- a/windows-target/Cargo.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[package]
-name = "RenegadeX-Launcher"
-version = "0.9.31"
-authors = ["SonnyX"]
-edition = "2018"
-build = "windows.rs"
-exclude = ["release/**", "i686-pc-windows-gnu/**", "RenX-Launcher.zip", "Renegade X Launcher.exe", "sciter.dll", "SelfUpdateExecutor.exe"]
-
-[[bin]]
-name = "RenegadeX-Launcher"
-path = "../src/main.rs"
-
-[dependencies]
-tokio = { version = "1.4", features = ["full"] }
-url = "2.2"
-sciter-rs = "0.5"
-renegadex_patcher = { git = "https://github.com/SonnyX/RenegadeX-patcher-lib", rev = "1b82927" }
-rust-ini = "0.17"
-single-instance = "0.3"
-socket2 = "0.3"
-rand = "0.8"
-percent-encoding = "2.1"
-unzip = { git = "https://github.com/SonnyX/unzip-rs" }
-dirs = "3.0"
-runas = { git = "https://github.com/SonnyX/rust-runas" }
-sha2 = "0.9"
-hex = "0.4"
-log = "0.4"
-flexi_logger = "0.17"
-download-async = "0.10"
-async-trait = "0.1"
-
-[build-dependencies]
-embed-resource = "1.6"
-
-[profile.release]
-opt-level = 'z'
-lto = true
\ No newline at end of file
diff --git a/windows-target/windows.rs b/windows-target/windows.rs
deleted file mode 100644
index 23dca78..0000000
--- a/windows-target/windows.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-extern crate embed_resource;
-
-
-fn main() {
-  embed_resource::compile("manifest.rc");
-}