diff --git a/magicbuild.sh b/dropshell-build/dropshell-build.sh
similarity index 100%
rename from magicbuild.sh
rename to dropshell-build/dropshell-build.sh
diff --git a/install_host.sh b/dropshell-build/install_host.sh
similarity index 100%
rename from install_host.sh
rename to dropshell-build/install_host.sh
diff --git a/test/.ccache/0/CACHEDIR.TAG b/dropshell-build/test/.ccache/0/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/0/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/0/CACHEDIR.TAG
diff --git a/test/.ccache/0/a/stats b/dropshell-build/test/.ccache/0/a/stats
similarity index 100%
rename from test/.ccache/0/a/stats
rename to dropshell-build/test/.ccache/0/a/stats
diff --git a/test/.ccache/0/c/aaicapo17sbvoqmjgn2cmlcheirsr2eM b/dropshell-build/test/.ccache/0/c/aaicapo17sbvoqmjgn2cmlcheirsr2eM
similarity index 100%
rename from test/.ccache/0/c/aaicapo17sbvoqmjgn2cmlcheirsr2eM
rename to dropshell-build/test/.ccache/0/c/aaicapo17sbvoqmjgn2cmlcheirsr2eM
diff --git a/test/.ccache/0/c/stats b/dropshell-build/test/.ccache/0/c/stats
similarity index 100%
rename from test/.ccache/0/c/stats
rename to dropshell-build/test/.ccache/0/c/stats
diff --git a/test/.ccache/0/stats b/dropshell-build/test/.ccache/0/stats
similarity index 100%
rename from test/.ccache/0/stats
rename to dropshell-build/test/.ccache/0/stats
diff --git a/test/.ccache/1/1/stats b/dropshell-build/test/.ccache/1/1/stats
similarity index 100%
rename from test/.ccache/1/1/stats
rename to dropshell-build/test/.ccache/1/1/stats
diff --git a/test/.ccache/1/2/stats b/dropshell-build/test/.ccache/1/2/stats
similarity index 100%
rename from test/.ccache/1/2/stats
rename to dropshell-build/test/.ccache/1/2/stats
diff --git a/test/.ccache/1/e/stats b/dropshell-build/test/.ccache/1/e/stats
similarity index 100%
rename from test/.ccache/1/e/stats
rename to dropshell-build/test/.ccache/1/e/stats
diff --git a/test/.ccache/2/5/stats b/dropshell-build/test/.ccache/2/5/stats
similarity index 100%
rename from test/.ccache/2/5/stats
rename to dropshell-build/test/.ccache/2/5/stats
diff --git a/test/.ccache/2/CACHEDIR.TAG b/dropshell-build/test/.ccache/2/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/2/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/2/CACHEDIR.TAG
diff --git a/test/.ccache/2/d/stats b/dropshell-build/test/.ccache/2/d/stats
similarity index 100%
rename from test/.ccache/2/d/stats
rename to dropshell-build/test/.ccache/2/d/stats
diff --git a/test/.ccache/2/e/9dc3onnqn8rat9gvebfkmhom2hm37teR b/dropshell-build/test/.ccache/2/e/9dc3onnqn8rat9gvebfkmhom2hm37teR
similarity index 100%
rename from test/.ccache/2/e/9dc3onnqn8rat9gvebfkmhom2hm37teR
rename to dropshell-build/test/.ccache/2/e/9dc3onnqn8rat9gvebfkmhom2hm37teR
diff --git a/test/.ccache/2/stats b/dropshell-build/test/.ccache/2/stats
similarity index 100%
rename from test/.ccache/2/stats
rename to dropshell-build/test/.ccache/2/stats
diff --git a/test/.ccache/3/4/stats b/dropshell-build/test/.ccache/3/4/stats
similarity index 100%
rename from test/.ccache/3/4/stats
rename to dropshell-build/test/.ccache/3/4/stats
diff --git a/test/.ccache/3/7/stats b/dropshell-build/test/.ccache/3/7/stats
similarity index 100%
rename from test/.ccache/3/7/stats
rename to dropshell-build/test/.ccache/3/7/stats
diff --git a/test/.ccache/3/e/stats b/dropshell-build/test/.ccache/3/e/stats
similarity index 100%
rename from test/.ccache/3/e/stats
rename to dropshell-build/test/.ccache/3/e/stats
diff --git a/test/.ccache/4/0/38skoanmcjl0asrltg5foudrhoa98l6R b/dropshell-build/test/.ccache/4/0/38skoanmcjl0asrltg5foudrhoa98l6R
similarity index 100%
rename from test/.ccache/4/0/38skoanmcjl0asrltg5foudrhoa98l6R
rename to dropshell-build/test/.ccache/4/0/38skoanmcjl0asrltg5foudrhoa98l6R
diff --git a/test/.ccache/4/CACHEDIR.TAG b/dropshell-build/test/.ccache/4/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/4/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/4/CACHEDIR.TAG
diff --git a/test/.ccache/4/b/e63vp6nheqb9ljsvvflf2rprmqrdtmuR b/dropshell-build/test/.ccache/4/b/e63vp6nheqb9ljsvvflf2rprmqrdtmuR
similarity index 100%
rename from test/.ccache/4/b/e63vp6nheqb9ljsvvflf2rprmqrdtmuR
rename to dropshell-build/test/.ccache/4/b/e63vp6nheqb9ljsvvflf2rprmqrdtmuR
diff --git a/test/.ccache/4/stats b/dropshell-build/test/.ccache/4/stats
similarity index 100%
rename from test/.ccache/4/stats
rename to dropshell-build/test/.ccache/4/stats
diff --git a/test/.ccache/6/1/99hro0kcqvitm08ph1qp23lc096dpjgM b/dropshell-build/test/.ccache/6/1/99hro0kcqvitm08ph1qp23lc096dpjgM
similarity index 100%
rename from test/.ccache/6/1/99hro0kcqvitm08ph1qp23lc096dpjgM
rename to dropshell-build/test/.ccache/6/1/99hro0kcqvitm08ph1qp23lc096dpjgM
diff --git a/test/.ccache/6/CACHEDIR.TAG b/dropshell-build/test/.ccache/6/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/6/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/6/CACHEDIR.TAG
diff --git a/test/.ccache/6/c/cfpg24omtabmcf0551a884a2i1480imR b/dropshell-build/test/.ccache/6/c/cfpg24omtabmcf0551a884a2i1480imR
similarity index 100%
rename from test/.ccache/6/c/cfpg24omtabmcf0551a884a2i1480imR
rename to dropshell-build/test/.ccache/6/c/cfpg24omtabmcf0551a884a2i1480imR
diff --git a/test/.ccache/6/stats b/dropshell-build/test/.ccache/6/stats
similarity index 100%
rename from test/.ccache/6/stats
rename to dropshell-build/test/.ccache/6/stats
diff --git a/test/.ccache/9/CACHEDIR.TAG b/dropshell-build/test/.ccache/9/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/9/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/9/CACHEDIR.TAG
diff --git a/test/.ccache/9/a/fd2897kchp5ong36tqk6obhs3al8grgM b/dropshell-build/test/.ccache/9/a/fd2897kchp5ong36tqk6obhs3al8grgM
similarity index 100%
rename from test/.ccache/9/a/fd2897kchp5ong36tqk6obhs3al8grgM
rename to dropshell-build/test/.ccache/9/a/fd2897kchp5ong36tqk6obhs3al8grgM
diff --git a/test/.ccache/9/stats b/dropshell-build/test/.ccache/9/stats
similarity index 100%
rename from test/.ccache/9/stats
rename to dropshell-build/test/.ccache/9/stats
diff --git a/test/.ccache/a/2/802tu8tqcjankp7asf9phvduq5nid82M b/dropshell-build/test/.ccache/a/2/802tu8tqcjankp7asf9phvduq5nid82M
similarity index 100%
rename from test/.ccache/a/2/802tu8tqcjankp7asf9phvduq5nid82M
rename to dropshell-build/test/.ccache/a/2/802tu8tqcjankp7asf9phvduq5nid82M
diff --git a/test/.ccache/a/9/49to0fu7pau2cla8merd8b3g64qh2noM b/dropshell-build/test/.ccache/a/9/49to0fu7pau2cla8merd8b3g64qh2noM
similarity index 100%
rename from test/.ccache/a/9/49to0fu7pau2cla8merd8b3g64qh2noM
rename to dropshell-build/test/.ccache/a/9/49to0fu7pau2cla8merd8b3g64qh2noM
diff --git a/test/.ccache/a/CACHEDIR.TAG b/dropshell-build/test/.ccache/a/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/a/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/a/CACHEDIR.TAG
diff --git a/test/.ccache/a/stats b/dropshell-build/test/.ccache/a/stats
similarity index 100%
rename from test/.ccache/a/stats
rename to dropshell-build/test/.ccache/a/stats
diff --git a/test/.ccache/b/1/80mp1h8inh43vbck35d22ai3d9s5e94R b/dropshell-build/test/.ccache/b/1/80mp1h8inh43vbck35d22ai3d9s5e94R
similarity index 100%
rename from test/.ccache/b/1/80mp1h8inh43vbck35d22ai3d9s5e94R
rename to dropshell-build/test/.ccache/b/1/80mp1h8inh43vbck35d22ai3d9s5e94R
diff --git a/test/.ccache/b/CACHEDIR.TAG b/dropshell-build/test/.ccache/b/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/b/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/b/CACHEDIR.TAG
diff --git a/test/.ccache/b/stats b/dropshell-build/test/.ccache/b/stats
similarity index 100%
rename from test/.ccache/b/stats
rename to dropshell-build/test/.ccache/b/stats
diff --git a/test/.ccache/c/0/3a34k150ga9nserg9pef8uij1gdvajeM b/dropshell-build/test/.ccache/c/0/3a34k150ga9nserg9pef8uij1gdvajeM
similarity index 100%
rename from test/.ccache/c/0/3a34k150ga9nserg9pef8uij1gdvajeM
rename to dropshell-build/test/.ccache/c/0/3a34k150ga9nserg9pef8uij1gdvajeM
diff --git a/test/.ccache/c/CACHEDIR.TAG b/dropshell-build/test/.ccache/c/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/c/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/c/CACHEDIR.TAG
diff --git a/test/.ccache/c/stats b/dropshell-build/test/.ccache/c/stats
similarity index 100%
rename from test/.ccache/c/stats
rename to dropshell-build/test/.ccache/c/stats
diff --git a/test/.ccache/f/4/8dp5jdv5s35vp9ugponj5s5qe8v4b9qR b/dropshell-build/test/.ccache/f/4/8dp5jdv5s35vp9ugponj5s5qe8v4b9qR
similarity index 100%
rename from test/.ccache/f/4/8dp5jdv5s35vp9ugponj5s5qe8v4b9qR
rename to dropshell-build/test/.ccache/f/4/8dp5jdv5s35vp9ugponj5s5qe8v4b9qR
diff --git a/test/.ccache/f/CACHEDIR.TAG b/dropshell-build/test/.ccache/f/CACHEDIR.TAG
similarity index 100%
rename from test/.ccache/f/CACHEDIR.TAG
rename to dropshell-build/test/.ccache/f/CACHEDIR.TAG
diff --git a/test/.ccache/f/stats b/dropshell-build/test/.ccache/f/stats
similarity index 100%
rename from test/.ccache/f/stats
rename to dropshell-build/test/.ccache/f/stats
diff --git a/test/.ccache/tmp/.cleaned b/dropshell-build/test/.ccache/tmp/.cleaned
similarity index 100%
rename from test/.ccache/tmp/.cleaned
rename to dropshell-build/test/.ccache/tmp/.cleaned
diff --git a/test/.ccache/tmp/inode-cache-64.v2 b/dropshell-build/test/.ccache/tmp/inode-cache-64.v2
similarity index 100%
rename from test/.ccache/tmp/inode-cache-64.v2
rename to dropshell-build/test/.ccache/tmp/inode-cache-64.v2
diff --git a/test/CMakeLists.txt b/dropshell-build/test/CMakeLists.txt
similarity index 100%
rename from test/CMakeLists.txt
rename to dropshell-build/test/CMakeLists.txt
diff --git a/test/cmake_prebuild.sh b/dropshell-build/test/cmake_prebuild.sh
old mode 100644
new mode 100755
similarity index 100%
rename from test/cmake_prebuild.sh
rename to dropshell-build/test/cmake_prebuild.sh
diff --git a/test/autogen/version.hpp b/dropshell-build/test/src/autogen/version.hpp
similarity index 100%
rename from test/autogen/version.hpp
rename to dropshell-build/test/src/autogen/version.hpp
diff --git a/test/src/httplib.hpp b/dropshell-build/test/src/httplib.hpp
similarity index 100%
rename from test/src/httplib.hpp
rename to dropshell-build/test/src/httplib.hpp
diff --git a/test/src/main.cpp b/dropshell-build/test/src/main.cpp
similarity index 100%
rename from test/src/main.cpp
rename to dropshell-build/test/src/main.cpp
diff --git a/test/src/version.hpp.in b/dropshell-build/test/src/version.hpp.in
similarity index 100%
rename from test/src/version.hpp.in
rename to dropshell-build/test/src/version.hpp.in