diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8182093a6f73385fbc17dc18c18beda671c1bba..5c97ca33558e9eccadc882a8673eac0c860fef8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,14 +313,22 @@ if(CMAKE_LINK_STATIC)
     set(LIBS "-static-libgcc -static-libstdc++ ${LIBS}")
 endif()
 
-file(GLOB SRCFILES_C "crypto/*.c")
+file(GLOB SRCFILES_C "backend/cpu/crypto/*.c")
 
 add_library(xmr-stak-c
     STATIC
     ${SRCFILES_C}
 )
 
-file(GLOB BACKEND_CPP  "*.cpp" "backend/cpu/*.cpp" "backend/*.cpp"  "crypto/*.cpp")
+file(GLOB BACKEND_CPP
+    "*.cpp"
+    "backend/cpu/*.cpp"
+    "backend/*.cpp"
+    "backend/cpu/crypto/*.cpp"
+    "http/*.cpp"
+    "misc/*.cpp"
+    "net/*.cpp")
+
 add_library(xmr-stak-backend
     STATIC
     ${BACKEND_CPP}
@@ -328,7 +336,9 @@ add_library(xmr-stak-backend
 target_link_libraries(xmr-stak-backend xmr-stak-c ${CMAKE_DL_LIBS})
 
 if(CUDA_FOUND)
-    file(GLOB CUDASRCFILES "backend/nvidia/nvcc_code/*.cu" "backend/nvidia/*.cpp")
+    file(GLOB CUDASRCFILES 
+        "backend/nvidia/nvcc_code/*.cu"
+        "backend/nvidia/*.cpp")
 
     #  build device code with nvcc
     cuda_add_library(xmrstak_cuda_backend
@@ -342,10 +352,12 @@ if(CUDA_FOUND)
 endif()
 
 if(OpenCL_FOUND)
-    file(GLOB OPENCLSRCFILES_C  "backend/amd/amd_gpu/*.cpp" "backend/amd/*.cpp")
+    file(GLOB OPENCLSRCFILES  
+        "backend/amd/amd_gpu/*.cpp"
+        "backend/amd/*.cpp")
     add_library(xmrstak_opencl_backend
         SHARED
-        ${OPENCLSRCFILES_C}
+        ${OPENCLSRCFILES}
     )
     target_link_libraries(xmrstak_opencl_backend ${OpenCL_LIBRARY} )
     if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
diff --git a/FREEBSDCOMPILE.md b/doc/FREEBSDCOMPILE.md
similarity index 100%
rename from FREEBSDCOMPILE.md
rename to doc/FREEBSDCOMPILE.md
diff --git a/LINUXCOMPILE.md b/doc/LINUXCOMPILE.md
similarity index 100%
rename from LINUXCOMPILE.md
rename to doc/LINUXCOMPILE.md
diff --git a/WINCOMPILE.md b/doc/WINCOMPILE.md
similarity index 100%
rename from WINCOMPILE.md
rename to doc/WINCOMPILE.md
diff --git a/xmr-stak-cpu.cbp b/xmr-stak-cpu.cbp
deleted file mode 100644
index c2f3774fb9971a1aff653fe323810207627f0d98..0000000000000000000000000000000000000000
--- a/xmr-stak-cpu.cbp
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="xmr-stak-cpu" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/miner" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="config-debug.txt" />
-				<Compiler>
-					<Add option="-std=c++11" />
-					<Add option="-m64" />
-					<Add option="-g" />
-					<Add directory="include" />
-				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/miner" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="config-debug.txt" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++11" />
-					<Add option="-m64" />
-					<Add option="-DNDEBUG" />
-					<Add directory="include" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-			<Target title="Release_test">
-				<Option output="bin/Release_test/miner" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release_test/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option parameters="config-debug.txt" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-std=c++11" />
-					<Add option="-m64" />
-					<Add directory="include" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add option="-m64" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-march=haswell" />
-			<Add option="-Wall" />
-		</Compiler>
-		<Linker>
-			<Add library="pthread" />
-			<Add library="libmicrohttpd" />
-			<Add library="crypto" />
-			<Add library="ssl" />
-			<Add library="libhwloc" />
-		</Linker>
-		<Unit filename="autoAdjust.hpp" />
-		<Unit filename="autoAdjustHwloc.hpp" />
-		<Unit filename="cli-miner.cpp" />
-		<Unit filename="console.cpp" />
-		<Unit filename="console.h" />
-		<Unit filename="crypto/c_blake256.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/c_blake256.h" />
-		<Unit filename="crypto/c_groestl.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/c_groestl.h" />
-		<Unit filename="crypto/c_jh.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/c_jh.h" />
-		<Unit filename="crypto/c_keccak.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/c_keccak.h" />
-		<Unit filename="crypto/c_skein.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="crypto/c_skein.h" />
-		<Unit filename="crypto/cryptonight.h" />
-		<Unit filename="crypto/cryptonight_aesni.h" />
-		<Unit filename="crypto/cryptonight_common.cpp" />
-		<Unit filename="crypto/groestl_tables.h" />
-		<Unit filename="crypto/hash.h" />
-		<Unit filename="crypto/int-util.h" />
-		<Unit filename="crypto/skein_port.h" />
-		<Unit filename="crypto/soft_aes.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="donate-level.h" />
-		<Unit filename="executor.cpp" />
-		<Unit filename="executor.h" />
-		<Unit filename="httpd.cpp" />
-		<Unit filename="httpd.h" />
-		<Unit filename="hwlocMemory.hpp" />
-		<Unit filename="jconf.cpp" />
-		<Unit filename="jconf.h" />
-		<Unit filename="jext.h" />
-		<Unit filename="jpsock.cpp" />
-		<Unit filename="jpsock.h" />
-		<Unit filename="minethd.cpp" />
-		<Unit filename="minethd.h" />
-		<Unit filename="msgstruct.h" />
-		<Unit filename="rapidjson/allocators.h" />
-		<Unit filename="rapidjson/document.h" />
-		<Unit filename="rapidjson/encodedstream.h" />
-		<Unit filename="rapidjson/encodings.h" />
-		<Unit filename="rapidjson/error/en.h" />
-		<Unit filename="rapidjson/error/error.h" />
-		<Unit filename="rapidjson/filereadstream.h" />
-		<Unit filename="rapidjson/filewritestream.h" />
-		<Unit filename="rapidjson/fwd.h" />
-		<Unit filename="rapidjson/internal/biginteger.h" />
-		<Unit filename="rapidjson/internal/diyfp.h" />
-		<Unit filename="rapidjson/internal/dtoa.h" />
-		<Unit filename="rapidjson/internal/ieee754.h" />
-		<Unit filename="rapidjson/internal/itoa.h" />
-		<Unit filename="rapidjson/internal/meta.h" />
-		<Unit filename="rapidjson/internal/pow10.h" />
-		<Unit filename="rapidjson/internal/regex.h" />
-		<Unit filename="rapidjson/internal/stack.h" />
-		<Unit filename="rapidjson/internal/strfunc.h" />
-		<Unit filename="rapidjson/internal/strtod.h" />
-		<Unit filename="rapidjson/internal/swap.h" />
-		<Unit filename="rapidjson/istreamwrapper.h" />
-		<Unit filename="rapidjson/memorybuffer.h" />
-		<Unit filename="rapidjson/memorystream.h" />
-		<Unit filename="rapidjson/msinttypes/inttypes.h" />
-		<Unit filename="rapidjson/msinttypes/stdint.h" />
-		<Unit filename="rapidjson/ostreamwrapper.h" />
-		<Unit filename="rapidjson/pointer.h" />
-		<Unit filename="rapidjson/prettywriter.h" />
-		<Unit filename="rapidjson/rapidjson.h" />
-		<Unit filename="rapidjson/reader.h" />
-		<Unit filename="rapidjson/schema.h" />
-		<Unit filename="rapidjson/stream.h" />
-		<Unit filename="rapidjson/stringbuffer.h" />
-		<Unit filename="rapidjson/writer.h" />
-		<Unit filename="socket.cpp" />
-		<Unit filename="socket.h" />
-		<Unit filename="socks.h" />
-		<Unit filename="thdq.hpp" />
-		<Unit filename="webdesign.cpp" />
-		<Unit filename="webdesign.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
similarity index 100%
rename from backend/amd/amd_gpu/gpu.cpp
rename to xmrstak/backend/amd/amd_gpu/gpu.cpp
diff --git a/backend/amd/amd_gpu/gpu.h b/xmrstak/backend/amd/amd_gpu/gpu.hpp
similarity index 100%
rename from backend/amd/amd_gpu/gpu.h
rename to xmrstak/backend/amd/amd_gpu/gpu.hpp
diff --git a/backend/amd/amd_gpu/opencl/blake256.cl b/xmrstak/backend/amd/amd_gpu/opencl/blake256.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/blake256.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/blake256.cl
diff --git a/backend/amd/amd_gpu/opencl/cryptonight.cl b/xmrstak/backend/amd/amd_gpu/opencl/cryptonight.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/cryptonight.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/cryptonight.cl
diff --git a/backend/amd/amd_gpu/opencl/groestl256.cl b/xmrstak/backend/amd/amd_gpu/opencl/groestl256.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/groestl256.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/groestl256.cl
diff --git a/backend/amd/amd_gpu/opencl/jh.cl b/xmrstak/backend/amd/amd_gpu/opencl/jh.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/jh.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/jh.cl
diff --git a/backend/amd/amd_gpu/opencl/wolf-aes.cl b/xmrstak/backend/amd/amd_gpu/opencl/wolf-aes.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/wolf-aes.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/wolf-aes.cl
diff --git a/backend/amd/amd_gpu/opencl/wolf-skein.cl b/xmrstak/backend/amd/amd_gpu/opencl/wolf-skein.cl
similarity index 100%
rename from backend/amd/amd_gpu/opencl/wolf-skein.cl
rename to xmrstak/backend/amd/amd_gpu/opencl/wolf-skein.cl
diff --git a/backend/amd/autoAdjust.hpp b/xmrstak/backend/amd/autoAdjust.hpp
similarity index 100%
rename from backend/amd/autoAdjust.hpp
rename to xmrstak/backend/amd/autoAdjust.hpp
diff --git a/backend/amd/config.tpl b/xmrstak/backend/amd/config.tpl
similarity index 100%
rename from backend/amd/config.tpl
rename to xmrstak/backend/amd/config.tpl
diff --git a/backend/amd/jconf.cpp b/xmrstak/backend/amd/jconf.cpp
similarity index 100%
rename from backend/amd/jconf.cpp
rename to xmrstak/backend/amd/jconf.cpp
diff --git a/backend/amd/jconf.h b/xmrstak/backend/amd/jconf.hpp
similarity index 100%
rename from backend/amd/jconf.h
rename to xmrstak/backend/amd/jconf.hpp
diff --git a/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp
similarity index 100%
rename from backend/amd/minethd.cpp
rename to xmrstak/backend/amd/minethd.cpp
diff --git a/backend/amd/minethd.h b/xmrstak/backend/amd/minethd.hpp
similarity index 100%
rename from backend/amd/minethd.h
rename to xmrstak/backend/amd/minethd.hpp
diff --git a/backend/BackendConnector.cpp b/xmrstak/backend/backendConnector.cpp
similarity index 100%
rename from backend/BackendConnector.cpp
rename to xmrstak/backend/backendConnector.cpp
diff --git a/backend/BackendConnector.hpp b/xmrstak/backend/backendConnector.hpp
similarity index 100%
rename from backend/BackendConnector.hpp
rename to xmrstak/backend/backendConnector.hpp
diff --git a/backend/cpu/autoAdjust.hpp b/xmrstak/backend/cpu/autoAdjust.hpp
similarity index 100%
rename from backend/cpu/autoAdjust.hpp
rename to xmrstak/backend/cpu/autoAdjust.hpp
diff --git a/backend/cpu/autoAdjustHwloc.hpp b/xmrstak/backend/cpu/autoAdjustHwloc.hpp
similarity index 100%
rename from backend/cpu/autoAdjustHwloc.hpp
rename to xmrstak/backend/cpu/autoAdjustHwloc.hpp
diff --git a/backend/cpu/config.tpl b/xmrstak/backend/cpu/config.tpl
similarity index 100%
rename from backend/cpu/config.tpl
rename to xmrstak/backend/cpu/config.tpl
diff --git a/crypto/c_blake256.c b/xmrstak/backend/cpu/crypto/c_blake256.c
similarity index 100%
rename from crypto/c_blake256.c
rename to xmrstak/backend/cpu/crypto/c_blake256.c
diff --git a/crypto/c_blake256.h b/xmrstak/backend/cpu/crypto/c_blake256.h
similarity index 100%
rename from crypto/c_blake256.h
rename to xmrstak/backend/cpu/crypto/c_blake256.h
diff --git a/crypto/c_groestl.c b/xmrstak/backend/cpu/crypto/c_groestl.c
similarity index 100%
rename from crypto/c_groestl.c
rename to xmrstak/backend/cpu/crypto/c_groestl.c
diff --git a/crypto/c_groestl.h b/xmrstak/backend/cpu/crypto/c_groestl.h
similarity index 100%
rename from crypto/c_groestl.h
rename to xmrstak/backend/cpu/crypto/c_groestl.h
diff --git a/crypto/c_jh.c b/xmrstak/backend/cpu/crypto/c_jh.c
similarity index 100%
rename from crypto/c_jh.c
rename to xmrstak/backend/cpu/crypto/c_jh.c
diff --git a/crypto/c_jh.h b/xmrstak/backend/cpu/crypto/c_jh.h
similarity index 100%
rename from crypto/c_jh.h
rename to xmrstak/backend/cpu/crypto/c_jh.h
diff --git a/crypto/c_keccak.c b/xmrstak/backend/cpu/crypto/c_keccak.c
similarity index 100%
rename from crypto/c_keccak.c
rename to xmrstak/backend/cpu/crypto/c_keccak.c
diff --git a/crypto/c_keccak.h b/xmrstak/backend/cpu/crypto/c_keccak.h
similarity index 100%
rename from crypto/c_keccak.h
rename to xmrstak/backend/cpu/crypto/c_keccak.h
diff --git a/crypto/c_skein.c b/xmrstak/backend/cpu/crypto/c_skein.c
similarity index 100%
rename from crypto/c_skein.c
rename to xmrstak/backend/cpu/crypto/c_skein.c
diff --git a/crypto/c_skein.h b/xmrstak/backend/cpu/crypto/c_skein.h
similarity index 100%
rename from crypto/c_skein.h
rename to xmrstak/backend/cpu/crypto/c_skein.h
diff --git a/crypto/cryptonight.h b/xmrstak/backend/cpu/crypto/cryptonight.h
similarity index 100%
rename from crypto/cryptonight.h
rename to xmrstak/backend/cpu/crypto/cryptonight.h
diff --git a/crypto/cryptonight_aesni.h b/xmrstak/backend/cpu/crypto/cryptonight_aesni.h
similarity index 100%
rename from crypto/cryptonight_aesni.h
rename to xmrstak/backend/cpu/crypto/cryptonight_aesni.h
diff --git a/crypto/cryptonight_common.cpp b/xmrstak/backend/cpu/crypto/cryptonight_common.cpp
similarity index 100%
rename from crypto/cryptonight_common.cpp
rename to xmrstak/backend/cpu/crypto/cryptonight_common.cpp
diff --git a/crypto/groestl_tables.h b/xmrstak/backend/cpu/crypto/groestl_tables.h
similarity index 100%
rename from crypto/groestl_tables.h
rename to xmrstak/backend/cpu/crypto/groestl_tables.h
diff --git a/crypto/hash.h b/xmrstak/backend/cpu/crypto/hash.h
similarity index 100%
rename from crypto/hash.h
rename to xmrstak/backend/cpu/crypto/hash.h
diff --git a/crypto/int-util.h b/xmrstak/backend/cpu/crypto/int-util.h
similarity index 100%
rename from crypto/int-util.h
rename to xmrstak/backend/cpu/crypto/int-util.h
diff --git a/crypto/skein_port.h b/xmrstak/backend/cpu/crypto/skein_port.h
similarity index 100%
rename from crypto/skein_port.h
rename to xmrstak/backend/cpu/crypto/skein_port.h
diff --git a/crypto/soft_aes.c b/xmrstak/backend/cpu/crypto/soft_aes.c
similarity index 100%
rename from crypto/soft_aes.c
rename to xmrstak/backend/cpu/crypto/soft_aes.c
diff --git a/hwlocMemory.hpp b/xmrstak/backend/cpu/hwlocMemory.hpp
similarity index 100%
rename from hwlocMemory.hpp
rename to xmrstak/backend/cpu/hwlocMemory.hpp
diff --git a/backend/cpu/jconf.cpp b/xmrstak/backend/cpu/jconf.cpp
similarity index 100%
rename from backend/cpu/jconf.cpp
rename to xmrstak/backend/cpu/jconf.cpp
diff --git a/backend/cpu/jconf.h b/xmrstak/backend/cpu/jconf.hpp
similarity index 100%
rename from backend/cpu/jconf.h
rename to xmrstak/backend/cpu/jconf.hpp
diff --git a/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp
similarity index 100%
rename from backend/cpu/minethd.cpp
rename to xmrstak/backend/cpu/minethd.cpp
diff --git a/backend/cpu/minethd.h b/xmrstak/backend/cpu/minethd.hpp
similarity index 100%
rename from backend/cpu/minethd.h
rename to xmrstak/backend/cpu/minethd.hpp
diff --git a/backend/GlobalStates.cpp b/xmrstak/backend/globalStates.cpp
similarity index 100%
rename from backend/GlobalStates.cpp
rename to xmrstak/backend/globalStates.cpp
diff --git a/backend/GlobalStates.hpp b/xmrstak/backend/globalStates.hpp
similarity index 100%
rename from backend/GlobalStates.hpp
rename to xmrstak/backend/globalStates.hpp
diff --git a/backend/IBackend.hpp b/xmrstak/backend/iBackend.hpp
similarity index 100%
rename from backend/IBackend.hpp
rename to xmrstak/backend/iBackend.hpp
diff --git a/backend/miner_work.h b/xmrstak/backend/miner_work.hpp
similarity index 100%
rename from backend/miner_work.h
rename to xmrstak/backend/miner_work.hpp
diff --git a/backend/nvidia/autoAdjust.hpp b/xmrstak/backend/nvidia/autoAdjust.hpp
similarity index 100%
rename from backend/nvidia/autoAdjust.hpp
rename to xmrstak/backend/nvidia/autoAdjust.hpp
diff --git a/backend/nvidia/config.tpl b/xmrstak/backend/nvidia/config.tpl
similarity index 100%
rename from backend/nvidia/config.tpl
rename to xmrstak/backend/nvidia/config.tpl
diff --git a/backend/nvidia/jconf.cpp b/xmrstak/backend/nvidia/jconf.cpp
similarity index 100%
rename from backend/nvidia/jconf.cpp
rename to xmrstak/backend/nvidia/jconf.cpp
diff --git a/backend/nvidia/jconf.h b/xmrstak/backend/nvidia/jconf.hpp
similarity index 100%
rename from backend/nvidia/jconf.h
rename to xmrstak/backend/nvidia/jconf.hpp
diff --git a/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp
similarity index 100%
rename from backend/nvidia/minethd.cpp
rename to xmrstak/backend/nvidia/minethd.cpp
diff --git a/backend/nvidia/minethd.h b/xmrstak/backend/nvidia/minethd.hpp
similarity index 100%
rename from backend/nvidia/minethd.h
rename to xmrstak/backend/nvidia/minethd.hpp
diff --git a/backend/nvidia/nvcc_code/cryptonight.h b/xmrstak/backend/nvidia/nvcc_code/cryptonight.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cryptonight.h
rename to xmrstak/backend/nvidia/nvcc_code/cryptonight.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_aes.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_aes.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_aes.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_aes.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_blake.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_blake.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_blake.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_blake.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_core.cu b/xmrstak/backend/nvidia/nvcc_code/cuda_core.cu
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_core.cu
rename to xmrstak/backend/nvidia/nvcc_code/cuda_core.cu
diff --git a/backend/nvidia/nvcc_code/cuda_device.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_device.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_device.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_device.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_extra.cu b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_extra.cu
rename to xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu
diff --git a/backend/nvidia/nvcc_code/cuda_extra.h b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_extra.h
rename to xmrstak/backend/nvidia/nvcc_code/cuda_extra.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_groestl.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_groestl.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_groestl.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_groestl.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_jh.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_jh.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_jh.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_jh.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_keccak.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_keccak.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_keccak.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_keccak.hpp
diff --git a/backend/nvidia/nvcc_code/cuda_skein.hpp b/xmrstak/backend/nvidia/nvcc_code/cuda_skein.hpp
similarity index 100%
rename from backend/nvidia/nvcc_code/cuda_skein.hpp
rename to xmrstak/backend/nvidia/nvcc_code/cuda_skein.hpp
diff --git a/backend/Plugin.hpp b/xmrstak/backend/plugin.hpp
similarity index 100%
rename from backend/Plugin.hpp
rename to xmrstak/backend/plugin.hpp
diff --git a/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp
similarity index 100%
rename from cli/cli-miner.cpp
rename to xmrstak/cli/cli-miner.cpp
diff --git a/config.tpl b/xmrstak/config.tpl
similarity index 100%
rename from config.tpl
rename to xmrstak/config.tpl
diff --git a/donate-level.h b/xmrstak/donate-level.hpp
similarity index 100%
rename from donate-level.h
rename to xmrstak/donate-level.hpp
diff --git a/httpd.cpp b/xmrstak/http/httpd.cpp
similarity index 100%
rename from httpd.cpp
rename to xmrstak/http/httpd.cpp
diff --git a/httpd.h b/xmrstak/http/httpd.hpp
similarity index 100%
rename from httpd.h
rename to xmrstak/http/httpd.hpp
diff --git a/webdesign.cpp b/xmrstak/http/webdesign.cpp
similarity index 100%
rename from webdesign.cpp
rename to xmrstak/http/webdesign.cpp
diff --git a/webdesign.h b/xmrstak/http/webdesign.hpp
similarity index 100%
rename from webdesign.h
rename to xmrstak/http/webdesign.hpp
diff --git a/jconf.cpp b/xmrstak/jconf.cpp
similarity index 100%
rename from jconf.cpp
rename to xmrstak/jconf.cpp
diff --git a/jconf.h b/xmrstak/jconf.hpp
similarity index 100%
rename from jconf.h
rename to xmrstak/jconf.hpp
diff --git a/ConfigEditor.hpp b/xmrstak/misc/configEditor.hpp
similarity index 100%
rename from ConfigEditor.hpp
rename to xmrstak/misc/configEditor.hpp
diff --git a/console.cpp b/xmrstak/misc/console.cpp
similarity index 100%
rename from console.cpp
rename to xmrstak/misc/console.cpp
diff --git a/console.h b/xmrstak/misc/console.hpp
similarity index 100%
rename from console.h
rename to xmrstak/misc/console.hpp
diff --git a/Environment.hpp b/xmrstak/misc/environment.hpp
similarity index 100%
rename from Environment.hpp
rename to xmrstak/misc/environment.hpp
diff --git a/executor.cpp b/xmrstak/misc/executor.cpp
similarity index 100%
rename from executor.cpp
rename to xmrstak/misc/executor.cpp
diff --git a/executor.h b/xmrstak/misc/executor.hpp
similarity index 100%
rename from executor.h
rename to xmrstak/misc/executor.hpp
diff --git a/jext.h b/xmrstak/misc/jext.hpp
similarity index 100%
rename from jext.h
rename to xmrstak/misc/jext.hpp
diff --git a/telemetry.cpp b/xmrstak/misc/telemetry.cpp
similarity index 100%
rename from telemetry.cpp
rename to xmrstak/misc/telemetry.cpp
diff --git a/telemetry.h b/xmrstak/misc/telemetry.hpp
similarity index 100%
rename from telemetry.h
rename to xmrstak/misc/telemetry.hpp
diff --git a/thdq.hpp b/xmrstak/misc/thdq.hpp
similarity index 100%
rename from thdq.hpp
rename to xmrstak/misc/thdq.hpp
diff --git a/jpsock.cpp b/xmrstak/net/jpsock.cpp
similarity index 100%
rename from jpsock.cpp
rename to xmrstak/net/jpsock.cpp
diff --git a/jpsock.h b/xmrstak/net/jpsock.hpp
similarity index 100%
rename from jpsock.h
rename to xmrstak/net/jpsock.hpp
diff --git a/msgstruct.h b/xmrstak/net/msgstruct.hpp
similarity index 100%
rename from msgstruct.h
rename to xmrstak/net/msgstruct.hpp
diff --git a/socket.cpp b/xmrstak/net/socket.cpp
similarity index 100%
rename from socket.cpp
rename to xmrstak/net/socket.cpp
diff --git a/socket.h b/xmrstak/net/socket.hpp
similarity index 100%
rename from socket.h
rename to xmrstak/net/socket.hpp
diff --git a/socks.h b/xmrstak/net/socks.hpp
similarity index 100%
rename from socks.h
rename to xmrstak/net/socks.hpp
diff --git a/Params.hpp b/xmrstak/params.hpp
similarity index 100%
rename from Params.hpp
rename to xmrstak/params.hpp
diff --git a/rapidjson/allocators.h b/xmrstak/rapidjson/allocators.h
similarity index 100%
rename from rapidjson/allocators.h
rename to xmrstak/rapidjson/allocators.h
diff --git a/rapidjson/document.h b/xmrstak/rapidjson/document.h
similarity index 100%
rename from rapidjson/document.h
rename to xmrstak/rapidjson/document.h
diff --git a/rapidjson/encodedstream.h b/xmrstak/rapidjson/encodedstream.h
similarity index 100%
rename from rapidjson/encodedstream.h
rename to xmrstak/rapidjson/encodedstream.h
diff --git a/rapidjson/encodings.h b/xmrstak/rapidjson/encodings.h
similarity index 100%
rename from rapidjson/encodings.h
rename to xmrstak/rapidjson/encodings.h
diff --git a/rapidjson/error/en.h b/xmrstak/rapidjson/error/en.h
similarity index 100%
rename from rapidjson/error/en.h
rename to xmrstak/rapidjson/error/en.h
diff --git a/rapidjson/error/error.h b/xmrstak/rapidjson/error/error.h
similarity index 100%
rename from rapidjson/error/error.h
rename to xmrstak/rapidjson/error/error.h
diff --git a/rapidjson/filereadstream.h b/xmrstak/rapidjson/filereadstream.h
similarity index 100%
rename from rapidjson/filereadstream.h
rename to xmrstak/rapidjson/filereadstream.h
diff --git a/rapidjson/filewritestream.h b/xmrstak/rapidjson/filewritestream.h
similarity index 100%
rename from rapidjson/filewritestream.h
rename to xmrstak/rapidjson/filewritestream.h
diff --git a/rapidjson/fwd.h b/xmrstak/rapidjson/fwd.h
similarity index 100%
rename from rapidjson/fwd.h
rename to xmrstak/rapidjson/fwd.h
diff --git a/rapidjson/internal/biginteger.h b/xmrstak/rapidjson/internal/biginteger.h
similarity index 100%
rename from rapidjson/internal/biginteger.h
rename to xmrstak/rapidjson/internal/biginteger.h
diff --git a/rapidjson/internal/diyfp.h b/xmrstak/rapidjson/internal/diyfp.h
similarity index 100%
rename from rapidjson/internal/diyfp.h
rename to xmrstak/rapidjson/internal/diyfp.h
diff --git a/rapidjson/internal/dtoa.h b/xmrstak/rapidjson/internal/dtoa.h
similarity index 100%
rename from rapidjson/internal/dtoa.h
rename to xmrstak/rapidjson/internal/dtoa.h
diff --git a/rapidjson/internal/ieee754.h b/xmrstak/rapidjson/internal/ieee754.h
similarity index 100%
rename from rapidjson/internal/ieee754.h
rename to xmrstak/rapidjson/internal/ieee754.h
diff --git a/rapidjson/internal/itoa.h b/xmrstak/rapidjson/internal/itoa.h
similarity index 100%
rename from rapidjson/internal/itoa.h
rename to xmrstak/rapidjson/internal/itoa.h
diff --git a/rapidjson/internal/meta.h b/xmrstak/rapidjson/internal/meta.h
similarity index 100%
rename from rapidjson/internal/meta.h
rename to xmrstak/rapidjson/internal/meta.h
diff --git a/rapidjson/internal/pow10.h b/xmrstak/rapidjson/internal/pow10.h
similarity index 100%
rename from rapidjson/internal/pow10.h
rename to xmrstak/rapidjson/internal/pow10.h
diff --git a/rapidjson/internal/regex.h b/xmrstak/rapidjson/internal/regex.h
similarity index 100%
rename from rapidjson/internal/regex.h
rename to xmrstak/rapidjson/internal/regex.h
diff --git a/rapidjson/internal/stack.h b/xmrstak/rapidjson/internal/stack.h
similarity index 100%
rename from rapidjson/internal/stack.h
rename to xmrstak/rapidjson/internal/stack.h
diff --git a/rapidjson/internal/strfunc.h b/xmrstak/rapidjson/internal/strfunc.h
similarity index 100%
rename from rapidjson/internal/strfunc.h
rename to xmrstak/rapidjson/internal/strfunc.h
diff --git a/rapidjson/internal/strtod.h b/xmrstak/rapidjson/internal/strtod.h
similarity index 100%
rename from rapidjson/internal/strtod.h
rename to xmrstak/rapidjson/internal/strtod.h
diff --git a/rapidjson/internal/swap.h b/xmrstak/rapidjson/internal/swap.h
similarity index 100%
rename from rapidjson/internal/swap.h
rename to xmrstak/rapidjson/internal/swap.h
diff --git a/rapidjson/istreamwrapper.h b/xmrstak/rapidjson/istreamwrapper.h
similarity index 100%
rename from rapidjson/istreamwrapper.h
rename to xmrstak/rapidjson/istreamwrapper.h
diff --git a/rapidjson/memorybuffer.h b/xmrstak/rapidjson/memorybuffer.h
similarity index 100%
rename from rapidjson/memorybuffer.h
rename to xmrstak/rapidjson/memorybuffer.h
diff --git a/rapidjson/memorystream.h b/xmrstak/rapidjson/memorystream.h
similarity index 100%
rename from rapidjson/memorystream.h
rename to xmrstak/rapidjson/memorystream.h
diff --git a/rapidjson/msinttypes/inttypes.h b/xmrstak/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from rapidjson/msinttypes/inttypes.h
rename to xmrstak/rapidjson/msinttypes/inttypes.h
diff --git a/rapidjson/msinttypes/stdint.h b/xmrstak/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from rapidjson/msinttypes/stdint.h
rename to xmrstak/rapidjson/msinttypes/stdint.h
diff --git a/rapidjson/ostreamwrapper.h b/xmrstak/rapidjson/ostreamwrapper.h
similarity index 100%
rename from rapidjson/ostreamwrapper.h
rename to xmrstak/rapidjson/ostreamwrapper.h
diff --git a/rapidjson/pointer.h b/xmrstak/rapidjson/pointer.h
similarity index 100%
rename from rapidjson/pointer.h
rename to xmrstak/rapidjson/pointer.h
diff --git a/rapidjson/prettywriter.h b/xmrstak/rapidjson/prettywriter.h
similarity index 100%
rename from rapidjson/prettywriter.h
rename to xmrstak/rapidjson/prettywriter.h
diff --git a/rapidjson/rapidjson.h b/xmrstak/rapidjson/rapidjson.h
similarity index 100%
rename from rapidjson/rapidjson.h
rename to xmrstak/rapidjson/rapidjson.h
diff --git a/rapidjson/reader.h b/xmrstak/rapidjson/reader.h
similarity index 100%
rename from rapidjson/reader.h
rename to xmrstak/rapidjson/reader.h
diff --git a/rapidjson/schema.h b/xmrstak/rapidjson/schema.h
similarity index 100%
rename from rapidjson/schema.h
rename to xmrstak/rapidjson/schema.h
diff --git a/rapidjson/stream.h b/xmrstak/rapidjson/stream.h
similarity index 100%
rename from rapidjson/stream.h
rename to xmrstak/rapidjson/stream.h
diff --git a/rapidjson/stringbuffer.h b/xmrstak/rapidjson/stringbuffer.h
similarity index 100%
rename from rapidjson/stringbuffer.h
rename to xmrstak/rapidjson/stringbuffer.h
diff --git a/rapidjson/writer.h b/xmrstak/rapidjson/writer.h
similarity index 100%
rename from rapidjson/writer.h
rename to xmrstak/rapidjson/writer.h
diff --git a/version.h b/xmrstak/version.hpp
similarity index 100%
rename from version.h
rename to xmrstak/version.hpp