diff --git a/binary_artifacts.sh b/binary_artifacts.sh
index 0bfdb6c..569b657 100755
--- a/binary_artifacts.sh
+++ b/binary_artifacts.sh
@@ -1,11 +1,58 @@
 echo Refreshing binaries from artifacts.supernet.org
 echo =========================================
 echo Step: Removing old binaries
+mkdir -p build
 cd build
 rm -rvf artifacts.supernet.org
 echo
 echo Step: Cloning latest binaries for build
 wget --recursive --no-parent https://artifacts.supernet.org/latest/
+chmod -R +x artifacts.supernet.org/latest/
 cd ..
 echo =========================================
-echo
+echo 
+echo =========================================
+echo Step: Moving osx binaries from artifacts to assets/bin/osx/
+echo 
+mv -fv build/artifacts.supernet.org/latest/osx/iguana assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/komodo-cli assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/komodod assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/libgcc_s.1.dylib assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/libgomp.1.dylib assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/libnanomsg.5.0.0.dylib assets/bin/osx/
+mv -fv build/artifacts.supernet.org/latest/osx/libstdc++.6.dylib assets/bin/osx/
+echo 
+echo =========================================
+echo Step: Moving Win64 binaries from artifacts to assets/bin/win64/
+echo 
+mv -fv build/artifacts.supernet.org/latest/windows/genkmdconf.bat assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/iguana.exe assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/index.html assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/komodo-cli.exe assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/komodo-tx.exe assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/komodod.exe assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libcrypto-1_1.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libcurl-4.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libcurl.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libgcc_s_sjlj-1.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libnanomsg.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libssl-1_1.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/libwinpthread-1.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/nanomsg.dll assets/bin/win64/
+mv -fv build/artifacts.supernet.org/latest/windows/pthreadvc2.dll assets/bin/win64/
+echo 
+echo =========================================
+echo Step: Moving linux64 binaries from artifacts to assets/bin/linux64
+echo 
+mv -fv build/artifacts.supernet.org/latest/linux/iguana assets/bin/linux64/
+mv -fv build/artifacts.supernet.org/latest/linux/komodo-cli assets/bin/linux64/
+mv -fv build/artifacts.supernet.org/latest/linux/komodod assets/bin/linux64/
+echo 
+echo =========================================
+echo Step: Cleaning artifacts data
+echo 
+rm -rf build/
+echo 
+echo =========================================
+echo Step: Finished Updating binaries from artifacts
+echo 
\ No newline at end of file
diff --git a/routes/shepherd.js b/routes/shepherd.js
index 9cfc851..6abb5bf 100644
--- a/routes/shepherd.js
+++ b/routes/shepherd.js
@@ -38,11 +38,11 @@ var iguanaConfsDirSrc = path.join(__dirname, '../assets/deps/confs'),
 // SETTING APP ICON FOR LINUX AND WINDOWS
 if (os.platform() === 'darwin') {
   fixPath();
-  var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/iguana'),
+  var iguanaBin = path.join(__dirname, '../assets/bin/osx/iguana'),
       iguanaDir = process.env.HOME + '/Library/Application Support/iguana',
       iguanaConfsDir = iguanaDir + '/confs',
-      komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/komodod'),
-      komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/osx/komodo-cli'),
+      komododBin = path.join(__dirname, '../assets/bin/osx/komodod'),
+      komodocliBin = path.join(__dirname, '../assets/bin/osx/komodo-cli'),
       komodoDir = process.env.HOME + '/Library/Application Support/Komodo',
       zcashdBin = '/Applications/ZCashSwingWalletUI.app/Contents/MacOS/zcashd',
       zcashcliBin = '/Applications/ZCashSwingWalletUI.app/Contents/MacOS/zcash-cli',
@@ -50,17 +50,17 @@ if (os.platform() === 'darwin') {
 }
 
 if (os.platform() === 'linux') {
-  var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/iguana'),
+  var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'),
       iguanaDir = process.env.HOME + '/.iguana',
       iguanaConfsDir = iguanaDir + '/confs',
       iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'),
-      komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodod'),
-      komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/linux/komodo-cli'),
+      komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'),
+      komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'),
       komodoDir = process.env.HOME + '/.komodo';
 }
 
 if (os.platform() === 'win32') {
-  var iguanaBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/iguana.exe');
+  var iguanaBin = path.join(__dirname, '../assets/bin/win64/iguana.exe');
       iguanaBin = path.normalize(iguanaBin);
       iguanaDir = process.env.APPDATA + '/iguana';
       iguanaDir = path.normalize(iguanaDir);
@@ -68,9 +68,9 @@ if (os.platform() === 'win32') {
       iguanaConfsDir = path.normalize(iguanaConfsDir);
       iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'),
       iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc),
-      komododBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/komodod.exe'),
+      komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'),
       komododBin = path.normalize(komododBin),
-      komodocliBin = path.join(__dirname, '../build/artifacts.supernet.org/latest/windows/komodo-cli.exe'),
+      komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'),
       komodocliBin = path.normalize(komodocliBin),
       komodoDir = process.env.APPDATA + '/Komodo',
       komodoDir = path.normalize(komodoDir);