diff --git a/deprecated/3P/civetweb/.gitattributes b/src/3P/civetweb/.gitattributes
similarity index 100%
rename from deprecated/3P/civetweb/.gitattributes
rename to src/3P/civetweb/.gitattributes
diff --git a/deprecated/3P/civetweb/.gitignore b/src/3P/civetweb/.gitignore
similarity index 100%
rename from deprecated/3P/civetweb/.gitignore
rename to src/3P/civetweb/.gitignore
diff --git a/deprecated/3P/civetweb/.travis.yml b/src/3P/civetweb/.travis.yml
similarity index 100%
rename from deprecated/3P/civetweb/.travis.yml
rename to src/3P/civetweb/.travis.yml
diff --git a/deprecated/3P/civetweb/CMakeLists.txt b/src/3P/civetweb/CMakeLists.txt
similarity index 100%
rename from deprecated/3P/civetweb/CMakeLists.txt
rename to src/3P/civetweb/CMakeLists.txt
diff --git a/deprecated/3P/civetweb/CREDITS.md b/src/3P/civetweb/CREDITS.md
similarity index 100%
rename from deprecated/3P/civetweb/CREDITS.md
rename to src/3P/civetweb/CREDITS.md
diff --git a/deprecated/3P/civetweb/LICENSE.md b/src/3P/civetweb/LICENSE.md
similarity index 100%
rename from deprecated/3P/civetweb/LICENSE.md
rename to src/3P/civetweb/LICENSE.md
diff --git a/deprecated/3P/civetweb/Makefile b/src/3P/civetweb/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/Makefile
rename to src/3P/civetweb/Makefile
diff --git a/deprecated/3P/civetweb/Makefile.deprecated b/src/3P/civetweb/Makefile.deprecated
similarity index 100%
rename from deprecated/3P/civetweb/Makefile.deprecated
rename to src/3P/civetweb/Makefile.deprecated
diff --git a/deprecated/3P/civetweb/Makefile.osx b/src/3P/civetweb/Makefile.osx
similarity index 100%
rename from deprecated/3P/civetweb/Makefile.osx
rename to src/3P/civetweb/Makefile.osx
diff --git a/deprecated/3P/civetweb/Qt/CivetWeb.pro b/src/3P/civetweb/Qt/CivetWeb.pro
similarity index 100%
rename from deprecated/3P/civetweb/Qt/CivetWeb.pro
rename to src/3P/civetweb/Qt/CivetWeb.pro
diff --git a/deprecated/3P/civetweb/Qt/Qt/CivetWeb.pro b/src/3P/civetweb/Qt/Qt/CivetWeb.pro
similarity index 100%
rename from deprecated/3P/civetweb/Qt/Qt/CivetWeb.pro
rename to src/3P/civetweb/Qt/Qt/CivetWeb.pro
diff --git a/deprecated/3P/civetweb/README.md b/src/3P/civetweb/README.md
similarity index 100%
rename from deprecated/3P/civetweb/README.md
rename to src/3P/civetweb/README.md
diff --git a/deprecated/3P/civetweb/RELEASE_NOTES.md b/src/3P/civetweb/RELEASE_NOTES.md
similarity index 100%
rename from deprecated/3P/civetweb/RELEASE_NOTES.md
rename to src/3P/civetweb/RELEASE_NOTES.md
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/buildRelease.pl b/src/3P/civetweb/VS2012/VS2012/buildRelease.pl
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/buildRelease.pl
rename to src/3P/civetweb/VS2012/VS2012/buildRelease.pl
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb.sln b/src/3P/civetweb/VS2012/VS2012/civetweb.sln
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb.sln
rename to src/3P/civetweb/VS2012/VS2012/civetweb.sln
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj b/src/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl.sln b/src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl.sln
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl.sln
rename to src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl.sln
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj b/src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj b/src/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj b/src/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/duktape_lib/duktape_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj b/src/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj b/src/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj b/src/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/ex_websocket/ex_websocket.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj b/src/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj b/src/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/lua_lib/lua_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj b/src/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/unit_test/unit_test.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj b/src/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj
rename to src/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj.filters b/src/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj.filters
rename to src/3P/civetweb/VS2012/VS2012/upload/upload.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/buildRelease.pl b/src/3P/civetweb/VS2012/buildRelease.pl
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/buildRelease.pl
rename to src/3P/civetweb/VS2012/buildRelease.pl
diff --git a/deprecated/3P/civetweb/VS2012/civetweb.sln b/src/3P/civetweb/VS2012/civetweb.sln
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb.sln
rename to src/3P/civetweb/VS2012/civetweb.sln
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj b/src/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj
rename to src/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters b/src/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
rename to src/3P/civetweb/VS2012/civetweb_lua/civetweb_lua.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl.sln b/src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl.sln
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl.sln
rename to src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl.sln
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj b/src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
rename to src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters b/src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
rename to src/3P/civetweb/VS2012/civetweb_yassl/civetweb_yassl/civetweb_yassl.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj b/src/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
rename to src/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters b/src/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/civetweb_yassl/yassl_lib/yassl_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj b/src/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj
rename to src/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj.filters b/src/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/duktape_lib/duktape_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj b/src/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
rename to src/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters b/src/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
rename to src/3P/civetweb/VS2012/ex_embed_cpp/ex_embed_cpp.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj b/src/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
rename to src/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters b/src/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
rename to src/3P/civetweb/VS2012/ex_embedded_c/ex_embedded_c.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj b/src/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj
rename to src/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj.filters b/src/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj.filters
rename to src/3P/civetweb/VS2012/ex_websocket/ex_websocket.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj b/src/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
rename to src/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters b/src/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
rename to src/3P/civetweb/VS2012/ex_websocket_client/ex_websocket_client.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj b/src/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj
rename to src/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj.filters b/src/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj.filters
rename to src/3P/civetweb/VS2012/lua_lib/lua_lib.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/unit_test/unit_test.vcxproj b/src/3P/civetweb/VS2012/unit_test/unit_test.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/unit_test/unit_test.vcxproj
rename to src/3P/civetweb/VS2012/unit_test/unit_test.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/unit_test/unit_test.vcxproj.filters b/src/3P/civetweb/VS2012/unit_test/unit_test.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/unit_test/unit_test.vcxproj.filters
rename to src/3P/civetweb/VS2012/unit_test/unit_test.vcxproj.filters
diff --git a/deprecated/3P/civetweb/VS2012/upload/upload.vcxproj b/src/3P/civetweb/VS2012/upload/upload.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/upload/upload.vcxproj
rename to src/3P/civetweb/VS2012/upload/upload.vcxproj
diff --git a/deprecated/3P/civetweb/VS2012/upload/upload.vcxproj.filters b/src/3P/civetweb/VS2012/upload/upload.vcxproj.filters
similarity index 100%
rename from deprecated/3P/civetweb/VS2012/upload/upload.vcxproj.filters
rename to src/3P/civetweb/VS2012/upload/upload.vcxproj.filters
diff --git a/deprecated/3P/civetweb/appveyor.yml b/src/3P/civetweb/appveyor.yml
similarity index 100%
rename from deprecated/3P/civetweb/appveyor.yml
rename to src/3P/civetweb/appveyor.yml
diff --git a/deprecated/3P/civetweb/build b/src/3P/civetweb/build
similarity index 100%
rename from deprecated/3P/civetweb/build
rename to src/3P/civetweb/build
diff --git a/deprecated/3P/civetweb/build.cmd b/src/3P/civetweb/build.cmd
similarity index 100%
rename from deprecated/3P/civetweb/build.cmd
rename to src/3P/civetweb/build.cmd
diff --git a/deprecated/3P/civetweb/builders/cmake/CMakeLists.txt b/src/3P/civetweb/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/3P/civetweb/builders/cmake/CMakeLists.txt
rename to src/3P/civetweb/builders/cmake/CMakeLists.txt
diff --git a/deprecated/3P/civetweb/ci/test/01_basic/basic_spec.lua b/src/3P/civetweb/ci/test/01_basic/basic_spec.lua
similarity index 100%
rename from deprecated/3P/civetweb/ci/test/01_basic/basic_spec.lua
rename to src/3P/civetweb/ci/test/01_basic/basic_spec.lua
diff --git a/deprecated/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_dir/git_keep_empty_dir b/src/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_dir/git_keep_empty_dir
similarity index 100%
rename from deprecated/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_dir/git_keep_empty_dir
rename to src/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_dir/git_keep_empty_dir
diff --git a/deprecated/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_file b/src/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_file
similarity index 100%
rename from deprecated/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_file
rename to src/3P/civetweb/ci/test/01_basic/docroot/01_basic_test_file
diff --git a/deprecated/3P/civetweb/ci/test/README.md b/src/3P/civetweb/ci/test/README.md
similarity index 100%
rename from deprecated/3P/civetweb/ci/test/README.md
rename to src/3P/civetweb/ci/test/README.md
diff --git a/deprecated/3P/civetweb/ci/test/civet.lua b/src/3P/civetweb/ci/test/civet.lua
similarity index 100%
rename from deprecated/3P/civetweb/ci/test/civet.lua
rename to src/3P/civetweb/ci/test/civet.lua
diff --git a/deprecated/3P/civetweb/ci/travis/install_rocks.sh b/src/3P/civetweb/ci/travis/install_rocks.sh
similarity index 100%
rename from deprecated/3P/civetweb/ci/travis/install_rocks.sh
rename to src/3P/civetweb/ci/travis/install_rocks.sh
diff --git a/deprecated/3P/civetweb/ci/travis/lua_env.sh b/src/3P/civetweb/ci/travis/lua_env.sh
similarity index 100%
rename from deprecated/3P/civetweb/ci/travis/lua_env.sh
rename to src/3P/civetweb/ci/travis/lua_env.sh
diff --git a/deprecated/3P/civetweb/ci/travis/platform.sh b/src/3P/civetweb/ci/travis/platform.sh
similarity index 100%
rename from deprecated/3P/civetweb/ci/travis/platform.sh
rename to src/3P/civetweb/ci/travis/platform.sh
diff --git a/deprecated/3P/civetweb/ci/travis/run_ci_tests.sh b/src/3P/civetweb/ci/travis/run_ci_tests.sh
similarity index 100%
rename from deprecated/3P/civetweb/ci/travis/run_ci_tests.sh
rename to src/3P/civetweb/ci/travis/run_ci_tests.sh
diff --git a/deprecated/3P/civetweb/ci/travis/setup_lua.sh b/src/3P/civetweb/ci/travis/setup_lua.sh
similarity index 100%
rename from deprecated/3P/civetweb/ci/travis/setup_lua.sh
rename to src/3P/civetweb/ci/travis/setup_lua.sh
diff --git a/deprecated/3P/civetweb/cmake/AddCCompilerFlag.cmake b/src/3P/civetweb/cmake/AddCCompilerFlag.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/AddCCompilerFlag.cmake
rename to src/3P/civetweb/cmake/AddCCompilerFlag.cmake
diff --git a/deprecated/3P/civetweb/cmake/AddCXXCompilerFlag.cmake b/src/3P/civetweb/cmake/AddCXXCompilerFlag.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/AddCXXCompilerFlag.cmake
rename to src/3P/civetweb/cmake/AddCXXCompilerFlag.cmake
diff --git a/deprecated/3P/civetweb/cmake/DetermineTargetArchitecture.cmake b/src/3P/civetweb/cmake/DetermineTargetArchitecture.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/DetermineTargetArchitecture.cmake
rename to src/3P/civetweb/cmake/DetermineTargetArchitecture.cmake
diff --git a/deprecated/3P/civetweb/cmake/FindLibDl.cmake b/src/3P/civetweb/cmake/FindLibDl.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/FindLibDl.cmake
rename to src/3P/civetweb/cmake/FindLibDl.cmake
diff --git a/deprecated/3P/civetweb/cmake/FindLibM.cmake b/src/3P/civetweb/cmake/FindLibM.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/FindLibM.cmake
rename to src/3P/civetweb/cmake/FindLibM.cmake
diff --git a/deprecated/3P/civetweb/cmake/FindLibRt.cmake b/src/3P/civetweb/cmake/FindLibRt.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/FindLibRt.cmake
rename to src/3P/civetweb/cmake/FindLibRt.cmake
diff --git a/deprecated/3P/civetweb/cmake/FindWinSock.cmake b/src/3P/civetweb/cmake/FindWinSock.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/FindWinSock.cmake
rename to src/3P/civetweb/cmake/FindWinSock.cmake
diff --git a/deprecated/3P/civetweb/cmake/check/patch.cmake b/src/3P/civetweb/cmake/check/patch.cmake
similarity index 100%
rename from deprecated/3P/civetweb/cmake/check/patch.cmake
rename to src/3P/civetweb/cmake/check/patch.cmake
diff --git a/deprecated/3P/civetweb/contrib/buildroot/Config.in b/src/3P/civetweb/contrib/buildroot/Config.in
similarity index 100%
rename from deprecated/3P/civetweb/contrib/buildroot/Config.in
rename to src/3P/civetweb/contrib/buildroot/Config.in
diff --git a/deprecated/3P/civetweb/contrib/buildroot/civetweb.mk b/src/3P/civetweb/contrib/buildroot/civetweb.mk
similarity index 100%
rename from deprecated/3P/civetweb/contrib/buildroot/civetweb.mk
rename to src/3P/civetweb/contrib/buildroot/civetweb.mk
diff --git a/deprecated/3P/civetweb/distribution/arch/PKGBUILD.git.example b/src/3P/civetweb/distribution/arch/PKGBUILD.git.example
similarity index 100%
rename from deprecated/3P/civetweb/distribution/arch/PKGBUILD.git.example
rename to src/3P/civetweb/distribution/arch/PKGBUILD.git.example
diff --git a/deprecated/3P/civetweb/distribution/arch/civetweb.service b/src/3P/civetweb/distribution/arch/civetweb.service
similarity index 100%
rename from deprecated/3P/civetweb/distribution/arch/civetweb.service
rename to src/3P/civetweb/distribution/arch/civetweb.service
diff --git a/deprecated/3P/civetweb/docs/Building.md b/src/3P/civetweb/docs/Building.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/Building.md
rename to src/3P/civetweb/docs/Building.md
diff --git a/deprecated/3P/civetweb/docs/Embedding.md b/src/3P/civetweb/docs/Embedding.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/Embedding.md
rename to src/3P/civetweb/docs/Embedding.md
diff --git a/deprecated/3P/civetweb/docs/Installing.md b/src/3P/civetweb/docs/Installing.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/Installing.md
rename to src/3P/civetweb/docs/Installing.md
diff --git a/deprecated/3P/civetweb/docs/OpenSSL.md b/src/3P/civetweb/docs/OpenSSL.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/OpenSSL.md
rename to src/3P/civetweb/docs/OpenSSL.md
diff --git a/deprecated/3P/civetweb/docs/UserManual.md b/src/3P/civetweb/docs/UserManual.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/UserManual.md
rename to src/3P/civetweb/docs/UserManual.md
diff --git a/deprecated/3P/civetweb/docs/yaSSL.md b/src/3P/civetweb/docs/yaSSL.md
similarity index 100%
rename from deprecated/3P/civetweb/docs/yaSSL.md
rename to src/3P/civetweb/docs/yaSSL.md
diff --git a/deprecated/3P/civetweb/examples/chat/Makefile b/src/3P/civetweb/examples/chat/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/chat/Makefile
rename to src/3P/civetweb/examples/chat/Makefile
diff --git a/deprecated/3P/civetweb/examples/chat/chat.c b/src/3P/civetweb/examples/chat/chat.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/chat/chat.c
rename to src/3P/civetweb/examples/chat/chat.c
diff --git a/deprecated/3P/civetweb/examples/docroot/favicon.ico b/src/3P/civetweb/examples/docroot/favicon.ico
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/favicon.ico
rename to src/3P/civetweb/examples/docroot/favicon.ico
diff --git a/deprecated/3P/civetweb/examples/docroot/index.html b/src/3P/civetweb/examples/docroot/index.html
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/index.html
rename to src/3P/civetweb/examples/docroot/index.html
diff --git a/deprecated/3P/civetweb/examples/docroot/jquery.js b/src/3P/civetweb/examples/docroot/jquery.js
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/jquery.js
rename to src/3P/civetweb/examples/docroot/jquery.js
diff --git a/deprecated/3P/civetweb/examples/docroot/login.html b/src/3P/civetweb/examples/docroot/login.html
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/login.html
rename to src/3P/civetweb/examples/docroot/login.html
diff --git a/deprecated/3P/civetweb/examples/docroot/logo.png b/src/3P/civetweb/examples/docroot/logo.png
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/logo.png
rename to src/3P/civetweb/examples/docroot/logo.png
diff --git a/deprecated/3P/civetweb/examples/docroot/main.js b/src/3P/civetweb/examples/docroot/main.js
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/main.js
rename to src/3P/civetweb/examples/docroot/main.js
diff --git a/deprecated/3P/civetweb/examples/docroot/prime_numbers.lp b/src/3P/civetweb/examples/docroot/prime_numbers.lp
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/prime_numbers.lp
rename to src/3P/civetweb/examples/docroot/prime_numbers.lp
diff --git a/deprecated/3P/civetweb/examples/docroot/style.css b/src/3P/civetweb/examples/docroot/style.css
similarity index 100%
rename from deprecated/3P/civetweb/examples/docroot/style.css
rename to src/3P/civetweb/examples/docroot/style.css
diff --git a/deprecated/3P/civetweb/examples/embedded_c/Makefile b/src/3P/civetweb/examples/embedded_c/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/embedded_c/Makefile
rename to src/3P/civetweb/examples/embedded_c/Makefile
diff --git a/deprecated/3P/civetweb/examples/embedded_c/embedded_c.c b/src/3P/civetweb/examples/embedded_c/embedded_c.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/embedded_c/embedded_c.c
rename to src/3P/civetweb/examples/embedded_c/embedded_c.c
diff --git a/deprecated/3P/civetweb/examples/embedded_cpp/Makefile b/src/3P/civetweb/examples/embedded_cpp/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/embedded_cpp/Makefile
rename to src/3P/civetweb/examples/embedded_cpp/Makefile
diff --git a/deprecated/3P/civetweb/examples/embedded_cpp/embedded_cpp.cpp b/src/3P/civetweb/examples/embedded_cpp/embedded_cpp.cpp
similarity index 100%
rename from deprecated/3P/civetweb/examples/embedded_cpp/embedded_cpp.cpp
rename to src/3P/civetweb/examples/embedded_cpp/embedded_cpp.cpp
diff --git a/deprecated/3P/civetweb/examples/hello/Makefile b/src/3P/civetweb/examples/hello/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/hello/Makefile
rename to src/3P/civetweb/examples/hello/Makefile
diff --git a/deprecated/3P/civetweb/examples/hello/hello.c b/src/3P/civetweb/examples/hello/hello.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/hello/hello.c
rename to src/3P/civetweb/examples/hello/hello.c
diff --git a/deprecated/3P/civetweb/examples/lua/lua_dll.c b/src/3P/civetweb/examples/lua/lua_dll.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/lua/lua_dll.c
rename to src/3P/civetweb/examples/lua/lua_dll.c
diff --git a/deprecated/3P/civetweb/examples/post/Makefile b/src/3P/civetweb/examples/post/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/post/Makefile
rename to src/3P/civetweb/examples/post/Makefile
diff --git a/deprecated/3P/civetweb/examples/post/post.c b/src/3P/civetweb/examples/post/post.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/post/post.c
rename to src/3P/civetweb/examples/post/post.c
diff --git a/deprecated/3P/civetweb/examples/upload/Makefile b/src/3P/civetweb/examples/upload/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/upload/Makefile
rename to src/3P/civetweb/examples/upload/Makefile
diff --git a/deprecated/3P/civetweb/examples/upload/upload.c b/src/3P/civetweb/examples/upload/upload.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/upload/upload.c
rename to src/3P/civetweb/examples/upload/upload.c
diff --git a/deprecated/3P/civetweb/examples/websocket/Makefile b/src/3P/civetweb/examples/websocket/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket/Makefile
rename to src/3P/civetweb/examples/websocket/Makefile
diff --git a/deprecated/3P/civetweb/examples/websocket/WebSockCallbacks.c b/src/3P/civetweb/examples/websocket/WebSockCallbacks.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket/WebSockCallbacks.c
rename to src/3P/civetweb/examples/websocket/WebSockCallbacks.c
diff --git a/deprecated/3P/civetweb/examples/websocket/WebSockCallbacks.h b/src/3P/civetweb/examples/websocket/WebSockCallbacks.h
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket/WebSockCallbacks.h
rename to src/3P/civetweb/examples/websocket/WebSockCallbacks.h
diff --git a/deprecated/3P/civetweb/examples/websocket/websock.htm b/src/3P/civetweb/examples/websocket/websock.htm
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket/websock.htm
rename to src/3P/civetweb/examples/websocket/websock.htm
diff --git a/deprecated/3P/civetweb/examples/websocket/websocket.c b/src/3P/civetweb/examples/websocket/websocket.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket/websocket.c
rename to src/3P/civetweb/examples/websocket/websocket.c
diff --git a/deprecated/3P/civetweb/examples/websocket_client/Makefile b/src/3P/civetweb/examples/websocket_client/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/Makefile
rename to src/3P/civetweb/examples/websocket_client/Makefile
diff --git a/deprecated/3P/civetweb/examples/websocket_client/ssl/server.crt b/src/3P/civetweb/examples/websocket_client/ssl/server.crt
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/ssl/server.crt
rename to src/3P/civetweb/examples/websocket_client/ssl/server.crt
diff --git a/deprecated/3P/civetweb/examples/websocket_client/ssl/server.csr b/src/3P/civetweb/examples/websocket_client/ssl/server.csr
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/ssl/server.csr
rename to src/3P/civetweb/examples/websocket_client/ssl/server.csr
diff --git a/deprecated/3P/civetweb/examples/websocket_client/ssl/server.key b/src/3P/civetweb/examples/websocket_client/ssl/server.key
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/ssl/server.key
rename to src/3P/civetweb/examples/websocket_client/ssl/server.key
diff --git a/deprecated/3P/civetweb/examples/websocket_client/ssl/server.key.orig b/src/3P/civetweb/examples/websocket_client/ssl/server.key.orig
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/ssl/server.key.orig
rename to src/3P/civetweb/examples/websocket_client/ssl/server.key.orig
diff --git a/deprecated/3P/civetweb/examples/websocket_client/ssl/server.pem b/src/3P/civetweb/examples/websocket_client/ssl/server.pem
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/ssl/server.pem
rename to src/3P/civetweb/examples/websocket_client/ssl/server.pem
diff --git a/deprecated/3P/civetweb/examples/websocket_client/websocket_client.c b/src/3P/civetweb/examples/websocket_client/websocket_client.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/websocket_client/websocket_client.c
rename to src/3P/civetweb/examples/websocket_client/websocket_client.c
diff --git a/deprecated/3P/civetweb/examples/ws_server/Makefile b/src/3P/civetweb/examples/ws_server/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/examples/ws_server/Makefile
rename to src/3P/civetweb/examples/ws_server/Makefile
diff --git a/deprecated/3P/civetweb/examples/ws_server/docroot/index.html b/src/3P/civetweb/examples/ws_server/docroot/index.html
similarity index 100%
rename from deprecated/3P/civetweb/examples/ws_server/docroot/index.html
rename to src/3P/civetweb/examples/ws_server/docroot/index.html
diff --git a/deprecated/3P/civetweb/examples/ws_server/ws_server.c b/src/3P/civetweb/examples/ws_server/ws_server.c
similarity index 100%
rename from deprecated/3P/civetweb/examples/ws_server/ws_server.c
rename to src/3P/civetweb/examples/ws_server/ws_server.c
diff --git a/deprecated/3P/civetweb/format.bat b/src/3P/civetweb/format.bat
similarity index 100%
rename from deprecated/3P/civetweb/format.bat
rename to src/3P/civetweb/format.bat
diff --git a/deprecated/3P/civetweb/include/CivetServer.h b/src/3P/civetweb/include/CivetServer.h
similarity index 100%
rename from deprecated/3P/civetweb/include/CivetServer.h
rename to src/3P/civetweb/include/CivetServer.h
diff --git a/deprecated/3P/civetweb/include/civetweb.h b/src/3P/civetweb/include/civetweb.h
similarity index 100%
rename from deprecated/3P/civetweb/include/civetweb.h
rename to src/3P/civetweb/include/civetweb.h
diff --git a/deprecated/3P/civetweb/mingw.cmd b/src/3P/civetweb/mingw.cmd
similarity index 100%
rename from deprecated/3P/civetweb/mingw.cmd
rename to src/3P/civetweb/mingw.cmd
diff --git a/deprecated/3P/civetweb/resources/Info.plist b/src/3P/civetweb/resources/Info.plist
similarity index 100%
rename from deprecated/3P/civetweb/resources/Info.plist
rename to src/3P/civetweb/resources/Info.plist
diff --git a/deprecated/3P/civetweb/resources/Makefile.in-duktape b/src/3P/civetweb/resources/Makefile.in-duktape
similarity index 100%
rename from deprecated/3P/civetweb/resources/Makefile.in-duktape
rename to src/3P/civetweb/resources/Makefile.in-duktape
diff --git a/deprecated/3P/civetweb/resources/Makefile.in-lua b/src/3P/civetweb/resources/Makefile.in-lua
similarity index 100%
rename from deprecated/3P/civetweb/resources/Makefile.in-lua
rename to src/3P/civetweb/resources/Makefile.in-lua
diff --git a/deprecated/3P/civetweb/resources/Makefile.in-os b/src/3P/civetweb/resources/Makefile.in-os
similarity index 100%
rename from deprecated/3P/civetweb/resources/Makefile.in-os
rename to src/3P/civetweb/resources/Makefile.in-os
diff --git a/deprecated/3P/civetweb/resources/cert/client.crt b/src/3P/civetweb/resources/cert/client.crt
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/client.crt
rename to src/3P/civetweb/resources/cert/client.crt
diff --git a/deprecated/3P/civetweb/resources/cert/client.csr b/src/3P/civetweb/resources/cert/client.csr
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/client.csr
rename to src/3P/civetweb/resources/cert/client.csr
diff --git a/deprecated/3P/civetweb/resources/cert/client.key b/src/3P/civetweb/resources/cert/client.key
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/client.key
rename to src/3P/civetweb/resources/cert/client.key
diff --git a/deprecated/3P/civetweb/resources/cert/client.key.orig b/src/3P/civetweb/resources/cert/client.key.orig
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/client.key.orig
rename to src/3P/civetweb/resources/cert/client.key.orig
diff --git a/deprecated/3P/civetweb/resources/cert/client.pem b/src/3P/civetweb/resources/cert/client.pem
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/client.pem
rename to src/3P/civetweb/resources/cert/client.pem
diff --git a/deprecated/3P/civetweb/resources/cert/make_certs b/src/3P/civetweb/resources/cert/make_certs
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/make_certs
rename to src/3P/civetweb/resources/cert/make_certs
diff --git a/deprecated/3P/civetweb/resources/cert/server.crt b/src/3P/civetweb/resources/cert/server.crt
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/server.crt
rename to src/3P/civetweb/resources/cert/server.crt
diff --git a/deprecated/3P/civetweb/resources/cert/server.csr b/src/3P/civetweb/resources/cert/server.csr
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/server.csr
rename to src/3P/civetweb/resources/cert/server.csr
diff --git a/deprecated/3P/civetweb/resources/cert/server.key b/src/3P/civetweb/resources/cert/server.key
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/server.key
rename to src/3P/civetweb/resources/cert/server.key
diff --git a/deprecated/3P/civetweb/resources/cert/server.key.orig b/src/3P/civetweb/resources/cert/server.key.orig
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/server.key.orig
rename to src/3P/civetweb/resources/cert/server.key.orig
diff --git a/deprecated/3P/civetweb/resources/cert/server.pem b/src/3P/civetweb/resources/cert/server.pem
similarity index 100%
rename from deprecated/3P/civetweb/resources/cert/server.pem
rename to src/3P/civetweb/resources/cert/server.pem
diff --git a/deprecated/3P/civetweb/resources/civetweb.conf b/src/3P/civetweb/resources/civetweb.conf
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb.conf
rename to src/3P/civetweb/resources/civetweb.conf
diff --git a/deprecated/3P/civetweb/resources/civetweb.icns b/src/3P/civetweb/resources/civetweb.icns
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb.icns
rename to src/3P/civetweb/resources/civetweb.icns
diff --git a/deprecated/3P/civetweb/resources/civetweb.psd b/src/3P/civetweb/resources/civetweb.psd
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb.psd
rename to src/3P/civetweb/resources/civetweb.psd
diff --git a/deprecated/3P/civetweb/resources/civetweb_16x16.png b/src/3P/civetweb/resources/civetweb_16x16.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_16x16.png
rename to src/3P/civetweb/resources/civetweb_16x16.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_16x16@2.png b/src/3P/civetweb/resources/civetweb_16x16@2.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_16x16@2.png
rename to src/3P/civetweb/resources/civetweb_16x16@2.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_22x22.png b/src/3P/civetweb/resources/civetweb_22x22.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_22x22.png
rename to src/3P/civetweb/resources/civetweb_22x22.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_22x22@2.png b/src/3P/civetweb/resources/civetweb_22x22@2.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_22x22@2.png
rename to src/3P/civetweb/resources/civetweb_22x22@2.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_32x32.png b/src/3P/civetweb/resources/civetweb_32x32.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_32x32.png
rename to src/3P/civetweb/resources/civetweb_32x32.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_32x32@2.png b/src/3P/civetweb/resources/civetweb_32x32@2.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_32x32@2.png
rename to src/3P/civetweb/resources/civetweb_32x32@2.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_64x64.png b/src/3P/civetweb/resources/civetweb_64x64.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_64x64.png
rename to src/3P/civetweb/resources/civetweb_64x64.png
diff --git a/deprecated/3P/civetweb/resources/civetweb_64x64@2.png b/src/3P/civetweb/resources/civetweb_64x64@2.png
similarity index 100%
rename from deprecated/3P/civetweb/resources/civetweb_64x64@2.png
rename to src/3P/civetweb/resources/civetweb_64x64@2.png
diff --git a/deprecated/3P/civetweb/resources/cleanup.lua b/src/3P/civetweb/resources/cleanup.lua
similarity index 100%
rename from deprecated/3P/civetweb/resources/cleanup.lua
rename to src/3P/civetweb/resources/cleanup.lua
diff --git a/deprecated/3P/civetweb/resources/coverity_check.sh b/src/3P/civetweb/resources/coverity_check.sh
similarity index 100%
rename from deprecated/3P/civetweb/resources/coverity_check.sh
rename to src/3P/civetweb/resources/coverity_check.sh
diff --git a/deprecated/3P/civetweb/resources/itworks.html b/src/3P/civetweb/resources/itworks.html
similarity index 100%
rename from deprecated/3P/civetweb/resources/itworks.html
rename to src/3P/civetweb/resources/itworks.html
diff --git a/deprecated/3P/civetweb/resources/jni/Android.mk b/src/3P/civetweb/resources/jni/Android.mk
similarity index 100%
rename from deprecated/3P/civetweb/resources/jni/Android.mk
rename to src/3P/civetweb/resources/jni/Android.mk
diff --git a/deprecated/3P/civetweb/resources/lua-logo.jpg b/src/3P/civetweb/resources/lua-logo.jpg
similarity index 100%
rename from deprecated/3P/civetweb/resources/lua-logo.jpg
rename to src/3P/civetweb/resources/lua-logo.jpg
diff --git a/deprecated/3P/civetweb/resources/luafilesystem-logo.jpg b/src/3P/civetweb/resources/luafilesystem-logo.jpg
similarity index 100%
rename from deprecated/3P/civetweb/resources/luafilesystem-logo.jpg
rename to src/3P/civetweb/resources/luafilesystem-logo.jpg
diff --git a/deprecated/3P/civetweb/resources/luasqlite-logo.jpg b/src/3P/civetweb/resources/luasqlite-logo.jpg
similarity index 100%
rename from deprecated/3P/civetweb/resources/luasqlite-logo.jpg
rename to src/3P/civetweb/resources/luasqlite-logo.jpg
diff --git a/deprecated/3P/civetweb/resources/luaxml-logo.jpg b/src/3P/civetweb/resources/luaxml-logo.jpg
similarity index 100%
rename from deprecated/3P/civetweb/resources/luaxml-logo.jpg
rename to src/3P/civetweb/resources/luaxml-logo.jpg
diff --git a/deprecated/3P/civetweb/resources/res.rc b/src/3P/civetweb/resources/res.rc
similarity index 100%
rename from deprecated/3P/civetweb/resources/res.rc
rename to src/3P/civetweb/resources/res.rc
diff --git a/deprecated/3P/civetweb/resources/sqlite3-logo.jpg b/src/3P/civetweb/resources/sqlite3-logo.jpg
similarity index 100%
rename from deprecated/3P/civetweb/resources/sqlite3-logo.jpg
rename to src/3P/civetweb/resources/sqlite3-logo.jpg
diff --git a/deprecated/3P/civetweb/resources/ssl_cert.pem b/src/3P/civetweb/resources/ssl_cert.pem
similarity index 100%
rename from deprecated/3P/civetweb/resources/ssl_cert.pem
rename to src/3P/civetweb/resources/ssl_cert.pem
diff --git a/deprecated/3P/civetweb/resources/systray.ico b/src/3P/civetweb/resources/systray.ico
similarity index 100%
rename from deprecated/3P/civetweb/resources/systray.ico
rename to src/3P/civetweb/resources/systray.ico
diff --git a/deprecated/3P/civetweb/src/CMakeLists.txt b/src/3P/civetweb/src/CMakeLists.txt
similarity index 100%
rename from deprecated/3P/civetweb/src/CMakeLists.txt
rename to src/3P/civetweb/src/CMakeLists.txt
diff --git a/deprecated/3P/civetweb/src/CivetServer.cpp b/src/3P/civetweb/src/CivetServer.cpp
similarity index 100%
rename from deprecated/3P/civetweb/src/CivetServer.cpp
rename to src/3P/civetweb/src/CivetServer.cpp
diff --git a/deprecated/3P/civetweb/src/civetweb.c b/src/3P/civetweb/src/civetweb.c
similarity index 100%
rename from deprecated/3P/civetweb/src/civetweb.c
rename to src/3P/civetweb/src/civetweb.c
diff --git a/deprecated/3P/civetweb/src/civetweb_private_lua.h b/src/3P/civetweb/src/civetweb_private_lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/civetweb_private_lua.h
rename to src/3P/civetweb/src/civetweb_private_lua.h
diff --git a/deprecated/3P/civetweb/src/main.c b/src/3P/civetweb/src/main.c
similarity index 100%
rename from deprecated/3P/civetweb/src/main.c
rename to src/3P/civetweb/src/main.c
diff --git a/deprecated/3P/civetweb/src/md5.inl b/src/3P/civetweb/src/md5.inl
similarity index 100%
rename from deprecated/3P/civetweb/src/md5.inl
rename to src/3P/civetweb/src/md5.inl
diff --git a/deprecated/3P/civetweb/src/mod_duktape.inl b/src/3P/civetweb/src/mod_duktape.inl
similarity index 100%
rename from deprecated/3P/civetweb/src/mod_duktape.inl
rename to src/3P/civetweb/src/mod_duktape.inl
diff --git a/deprecated/3P/civetweb/src/mod_lua.inl b/src/3P/civetweb/src/mod_lua.inl
similarity index 100%
rename from deprecated/3P/civetweb/src/mod_lua.inl
rename to src/3P/civetweb/src/mod_lua.inl
diff --git a/deprecated/3P/civetweb/src/third_party/LuaXML.lua b/src/3P/civetweb/src/third_party/LuaXML.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/LuaXML.lua
rename to src/3P/civetweb/src/third_party/LuaXML.lua
diff --git a/deprecated/3P/civetweb/src/third_party/LuaXML_lib.c b/src/3P/civetweb/src/third_party/LuaXML_lib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/LuaXML_lib.c
rename to src/3P/civetweb/src/third_party/LuaXML_lib.c
diff --git a/deprecated/3P/civetweb/src/third_party/civetweb_lua.h b/src/3P/civetweb/src/third_party/civetweb_lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/civetweb_lua.h
rename to src/3P/civetweb/src/third_party/civetweb_lua.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/AUTHORS.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/AUTHORS.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/AUTHORS.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/AUTHORS.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/LICENSE.txt b/src/3P/civetweb/src/third_party/duktape-1.3.0/LICENSE.txt
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/LICENSE.txt
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/LICENSE.txt
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.cmdline b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.cmdline
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.cmdline
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.cmdline
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.codepage b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.codepage
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.codepage
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.codepage
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.coffee b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.coffee
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.coffee
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.coffee
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.dukdebug b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.dukdebug
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.dukdebug
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.dukdebug
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eval b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eval
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eval
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eval
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eventloop b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eventloop
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eventloop
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.eventloop
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.hello b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.hello
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.hello
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.hello
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.jxpretty b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.jxpretty
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.jxpretty
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.jxpretty
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.sandbox b/src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.sandbox
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.sandbox
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/Makefile.sandbox
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/config/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/config/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig.py b/src/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig.py
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig.py
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig.py
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig_metadata.tar.gz b/src/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig_metadata.tar.gz
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig_metadata.tar.gz
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/config/genconfig_metadata.tar.gz
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/Makefile b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/Makefile
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_classnames.yaml b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_classnames.yaml
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_classnames.yaml
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_classnames.yaml
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debug.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debug.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debug.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debug.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debugcommands.yaml b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debugcommands.yaml
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debugcommands.yaml
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_debugcommands.yaml
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_opcodes.yaml b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_opcodes.yaml
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_opcodes.yaml
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/duk_opcodes.yaml
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/package.json b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/package.json
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/package.json
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/package.json
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/index.html b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/index.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/index.html
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/index.html
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/style.css b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/style.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/style.css
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/style.css
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/webui.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/webui.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/webui.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/debugger/static/webui.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/duk_build_meta.json b/src/3P/civetweb/src/third_party/duktape-1.3.0/duk_build_meta.json
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/duk_build_meta.json
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/duk_build_meta.json
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-hybrid/duk_alloc_hybrid.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/duk_alloc_logging.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/log2gnuplot.py b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/log2gnuplot.py
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/log2gnuplot.py
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-logging/log2gnuplot.py
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/alloc-torture/duk_alloc_torture.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline_ajduk.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline_ajduk.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline_ajduk.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/cmdline/duk_cmdline_ajduk.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/duk_codepage_conv.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/test.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/test.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/test.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/codepage-conv/test.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/globals.coffee b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/globals.coffee
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/globals.coffee
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/globals.coffee
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/hello.coffee b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/hello.coffee
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/hello.coffee
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/hello.coffee
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/mandel.coffee b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/mandel.coffee
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/mandel.coffee
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/coffee/mandel.coffee
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/Makefile b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/Makefile
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/duk_trans_dvalue.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/test.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/test.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/test.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-dvalue/test.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/debug-trans-socket/duk_trans_socket.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/dummy_date_provider.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/dummy_date_provider.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/dummy_date_provider.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/dummy-date-provider/dummy_date_provider.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/eval.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/eval.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/eval.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eval/eval.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/basic-test.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/basic-test.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/basic-test.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/basic-test.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/c_eventloop.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/client-socket-test.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/client-socket-test.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/client-socket-test.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/client-socket-test.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/curses-timers.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/curses-timers.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/curses-timers.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/curses-timers.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ecma_eventloop.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ecma_eventloop.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ecma_eventloop.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ecma_eventloop.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/fileio.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/fileio.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/fileio.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/fileio.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/main.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/main.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/main.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/main.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ncurses.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ncurses.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ncurses.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/ncurses.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/poll.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/poll.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/poll.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/poll.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/server-socket-test.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/server-socket-test.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/server-socket-test.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/server-socket-test.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/socket.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/socket.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/socket.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/eventloop/socket.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/fib.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/fib.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/fib.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/fib.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/prime.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/prime.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/prime.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/prime.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/primecheck.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/primecheck.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/primecheck.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/primecheck.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/process.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/process.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/process.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/process.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/processlines.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/processlines.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/processlines.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/processlines.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/uppercase.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/uppercase.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/uppercase.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/guide/uppercase.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/hello.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/hello.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/hello.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/hello/hello.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/jxpretty.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/jxpretty.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/jxpretty.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/jxpretty/jxpretty.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/sandbox.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/sandbox.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/sandbox.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/examples/sandbox/sandbox.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/extras/README.rst b/src/3P/civetweb/src/third_party/duktape-1.3.0/extras/README.rst
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/extras/README.rst
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/extras/README.rst
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/license.spdx b/src/3P/civetweb/src/third_party/duktape-1.3.0/license.spdx
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/license.spdx
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/license.spdx
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/licenses/commonjs.txt b/src/3P/civetweb/src/third_party/duktape-1.3.0/licenses/commonjs.txt
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/licenses/commonjs.txt
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/licenses/commonjs.txt
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/licenses/murmurhash2.txt b/src/3P/civetweb/src/third_party/duktape-1.3.0/licenses/murmurhash2.txt
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/licenses/murmurhash2.txt
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/licenses/murmurhash2.txt
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/mandel.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/mandel.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/mandel.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/mandel.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/console-minimal.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/console-minimal.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/console-minimal.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/console-minimal.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/duktape-isfastint.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/duktape-isfastint.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/duktape-isfastint.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/duktape-isfastint.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-assign.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-assign.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-assign.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-assign.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definegetter.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definegetter.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definegetter.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definegetter.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definesetter.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definesetter.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definesetter.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/object-prototype-definesetter.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/performance-now.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/performance-now.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/performance-now.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/polyfills/performance-now.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_alloc_default.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_alloc_default.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_alloc_default.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_alloc_default.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_buffer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_buffer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_buffer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_buffer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_bytecode.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_bytecode.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_bytecode.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_bytecode.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_call.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_call.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_call.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_call.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_codec.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_codec.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_codec.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_codec.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_compile.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_compile.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_compile.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_compile.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_debug.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_debug.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_debug.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_debug.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_heap.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_heap.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_heap.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_heap.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_internal.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_internal.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_internal.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_internal.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_logging.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_logging.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_logging.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_logging.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_memory.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_memory.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_memory.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_memory.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_object.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_object.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_object.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_object.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_stack.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_stack.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_stack.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_stack.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_string.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_string.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_string.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_string.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_var.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_var.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_var.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_api_var.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_array.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_array.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_array.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_array.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_boolean.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_boolean.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_boolean.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_boolean.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_buffer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_buffer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_buffer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_buffer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_unix.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_unix.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_unix.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_unix.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_windows.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_windows.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_windows.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_date_windows.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_duktape.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_duktape.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_duktape.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_duktape.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_error.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_error.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_error.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_error.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_function.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_function.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_function.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_function.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_global.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_global.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_global.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_global.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_json.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_json.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_json.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_json.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_logger.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_logger.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_logger.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_logger.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_math.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_math.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_math.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_math.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_number.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_number.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_number.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_number.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_object.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_object.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_object.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_object.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_pointer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_pointer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_pointer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_pointer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_protos.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_protos.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_protos.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_protos.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_proxy.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_proxy.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_proxy.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_proxy.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_regexp.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_regexp.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_regexp.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_regexp.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_string.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_string.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_string.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_string.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thread.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thread.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thread.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thread.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thrower.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thrower.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thrower.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_bi_thrower.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_builtins.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_config.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_config.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_config.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_config.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_fixedbuffer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_fixedbuffer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_fixedbuffer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_fixedbuffer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_heap.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_heap.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_heap.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_heap.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_macros.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_macros.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_macros.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_macros.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_vsnprintf.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_vsnprintf.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_vsnprintf.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debug_vsnprintf.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_debugger.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_augment.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_augment.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_augment.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_augment.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_longjmp.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_longjmp.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_longjmp.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_longjmp.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_macros.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_macros.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_macros.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_macros.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_throw.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_throw.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_throw.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_error_throw.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_forwdecl.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_forwdecl.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_forwdecl.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_forwdecl.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_alloc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_alloc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_alloc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_alloc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_ops.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_ops.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_ops.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbuffer_ops.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hbufferobject_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hcompiledfunction.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hcompiledfunction.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hcompiledfunction.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hcompiledfunction.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_alloc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_alloc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_alloc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_alloc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_hashstring.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_hashstring.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_hashstring.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_hashstring.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_markandsweep.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_markandsweep.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_markandsweep.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_markandsweep.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_memory.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_memory.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_memory.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_memory.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_refcount.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_refcount.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_refcount.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_refcount.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringcache.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringcache.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringcache.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringcache.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringtable.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringtable.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringtable.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heap_stringtable.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heaphdr.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heaphdr.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heaphdr.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_heaphdr.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hnativefunction.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hnativefunction.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hnativefunction.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hnativefunction.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_alloc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_alloc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_alloc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_alloc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_class.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_class.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_class.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_class.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_enum.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_enum.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_enum.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_enum.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_finalizer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_finalizer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_finalizer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_finalizer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_pc2line.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_pc2line.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_pc2line.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_pc2line.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_props.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_props.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_props.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hobject_props.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hstring_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_alloc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_alloc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_alloc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_alloc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_builtins.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_builtins.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_builtins.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_builtins.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_stacks.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_stacks.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_stacks.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_hthread_stacks.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_initjs_min.js b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_initjs_min.js
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_initjs_min.js
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_initjs_min.js
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_internal.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_internal.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_internal.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_internal.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_jmpbuf.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_jmpbuf.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_jmpbuf.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_jmpbuf.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_bytecode.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_bytecode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_bytecode.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_bytecode.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_call.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_call.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_call.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_call.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_compiler.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_executor.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_executor.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_executor.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_executor.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_ops.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_ops.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_ops.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_ops.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_var.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_var.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_var.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_js_var.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_json.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_json.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_json.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_json.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_lexer.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_numconv.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_compiler.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_compiler.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_compiler.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_compiler.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_executor.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_executor.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_executor.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_regexp_executor.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_replacements.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_selftest.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_strings.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_tval.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_support.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_support.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_support.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_support.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_tables.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_tables.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_tables.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_unicode_tables.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitdecoder.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitdecoder.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitdecoder.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitdecoder.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitencoder.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitencoder.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitencoder.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bitencoder.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bufwriter.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bufwriter.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bufwriter.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_bufwriter.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashbytes.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashbytes.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashbytes.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashbytes.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashprime.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashprime.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashprime.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_hashprime.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_misc.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_misc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_misc.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_misc.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_tinyrandom.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_tinyrandom.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_tinyrandom.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duk_util_tinyrandom.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duktape.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duktape.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duktape.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src-separate/duktape.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duk_config.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src/duk_config.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duk_config.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src/duk_config.h
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.c b/src/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.c
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.c
diff --git a/deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.h b/src/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.h
rename to src/3P/civetweb/src/third_party/duktape-1.3.0/src/duktape.h
diff --git a/deprecated/3P/civetweb/src/third_party/lfs.c b/src/3P/civetweb/src/third_party/lfs.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lfs.c
rename to src/3P/civetweb/src/third_party/lfs.c
diff --git a/deprecated/3P/civetweb/src/third_party/lfs.h b/src/3P/civetweb/src/third_party/lfs.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lfs.h
rename to src/3P/civetweb/src/third_party/lfs.h
diff --git a/deprecated/3P/civetweb/src/third_party/lsqlite3.c b/src/3P/civetweb/src/third_party/lsqlite3.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lsqlite3.c
rename to src/3P/civetweb/src/third_party/lsqlite3.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/COPYRIGHT b/src/3P/civetweb/src/third_party/lua-5.1.5/COPYRIGHT
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/COPYRIGHT
rename to src/3P/civetweb/src/third_party/lua-5.1.5/COPYRIGHT
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/HISTORY b/src/3P/civetweb/src/third_party/lua-5.1.5/HISTORY
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/HISTORY
rename to src/3P/civetweb/src/third_party/lua-5.1.5/HISTORY
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/INSTALL b/src/3P/civetweb/src/third_party/lua-5.1.5/INSTALL
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/INSTALL
rename to src/3P/civetweb/src/third_party/lua-5.1.5/INSTALL
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/Makefile b/src/3P/civetweb/src/third_party/lua-5.1.5/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.1.5/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/README b/src/3P/civetweb/src/third_party/lua-5.1.5/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/README
rename to src/3P/civetweb/src/third_party/lua-5.1.5/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/contents.html b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/contents.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/contents.html
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/contents.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/cover.png b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/cover.png
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/cover.png
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/cover.png
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/logo.gif b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/logo.gif
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/logo.gif
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/logo.gif
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.1 b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.1
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.css b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.css
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.html b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.html
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/lua.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.1 b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.1
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.html b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.html
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/luac.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.css b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.css
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.html b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.html
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/manual.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/readme.html b/src/3P/civetweb/src/third_party/lua-5.1.5/doc/readme.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/doc/readme.html
rename to src/3P/civetweb/src/third_party/lua-5.1.5/doc/readme.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/Makefile b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/README b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/README
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/all.c b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/all.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/all.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/all.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.hpp b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.hpp
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.hpp
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.hpp
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.ico b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.ico
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.ico
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.ico
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.pc b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.pc
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.pc
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/lua.pc
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/luavs.bat b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/luavs.bat
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/luavs.bat
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/luavs.bat
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/min.c b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/min.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/min.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/min.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/noparser.c b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/noparser.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/noparser.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/noparser.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/strict.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/etc/strict.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/etc/strict.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/etc/strict.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/Makefile b/src/3P/civetweb/src/third_party/lua-5.1.5/src/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lapi.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lauxlib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lbaselib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lbaselib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lbaselib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lbaselib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lcode.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldblib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldblib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldblib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldblib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldebug.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldo.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldump.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ldump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ldump.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ldump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lfunc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lgc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/linit.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/linit.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/linit.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/linit.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/liolib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/liolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/liolib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/liolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llex.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/llex.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llex.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/llex.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llex.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/llex.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llex.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/llex.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llimits.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/llimits.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/llimits.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/llimits.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmathlib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lmathlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmathlib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lmathlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lmem.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/loadlib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/loadlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/loadlib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/loadlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lopcodes.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/loslib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/loslib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/loslib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/loslib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lparser.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lstate.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lstring.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstrlib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lstrlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lstrlib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lstrlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ltable.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltablib.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ltablib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltablib.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ltablib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/ltm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lua.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lua.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lua.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lua.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lua.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lua.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lua.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/luac.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/luac.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/luac.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/luac.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/luaconf.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/luaconf.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/luaconf.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/luaconf.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lualib.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lualib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lualib.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lualib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lundump.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lvm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.h b/src/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.h
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/lzio.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/print.c b/src/3P/civetweb/src/third_party/lua-5.1.5/src/print.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/src/print.c
rename to src/3P/civetweb/src/third_party/lua-5.1.5/src/print.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/README b/src/3P/civetweb/src/third_party/lua-5.1.5/test/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/README
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/bisect.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/bisect.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/bisect.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/bisect.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/cf.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/cf.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/cf.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/cf.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/echo.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/echo.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/echo.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/echo.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/env.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/env.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/env.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/env.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/factorial.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/factorial.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/factorial.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/factorial.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/fib.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/fib.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/fib.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/fib.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/fibfor.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/fibfor.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/fibfor.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/fibfor.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/globals.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/globals.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/globals.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/globals.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/hello.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/hello.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/hello.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/hello.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/life.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/life.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/life.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/life.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/luac.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/luac.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/luac.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/luac.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/printf.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/printf.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/printf.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/printf.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/readonly.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/readonly.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/readonly.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/readonly.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/sieve.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/sieve.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/sieve.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/sieve.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/sort.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/sort.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/sort.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/sort.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/table.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/table.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/table.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/table.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/trace-calls.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/trace-calls.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/trace-calls.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/trace-calls.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/trace-globals.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/trace-globals.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/trace-globals.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/trace-globals.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/xd.lua b/src/3P/civetweb/src/third_party/lua-5.1.5/test/xd.lua
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.1.5/test/xd.lua
rename to src/3P/civetweb/src/third_party/lua-5.1.5/test/xd.lua
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/Makefile b/src/3P/civetweb/src/third_party/lua-5.2.3/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.2.3/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/README b/src/3P/civetweb/src/third_party/lua-5.2.3/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/README
rename to src/3P/civetweb/src/third_party/lua-5.2.3/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/contents.html b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/contents.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/contents.html
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/contents.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/logo.gif b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/logo.gif
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/logo.gif
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/logo.gif
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.1 b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.1
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.css b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.css
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/lua.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/luac.1 b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/luac.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/luac.1
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/luac.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.css b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.css
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.html b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.html
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/manual.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/osi-certified-72x60.png b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/osi-certified-72x60.png
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/osi-certified-72x60.png
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/osi-certified-72x60.png
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/readme.html b/src/3P/civetweb/src/third_party/lua-5.2.3/doc/readme.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/doc/readme.html
rename to src/3P/civetweb/src/third_party/lua-5.2.3/doc/readme.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/Makefile b/src/3P/civetweb/src/third_party/lua-5.2.3/src/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lapi.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lauxlib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lbaselib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lbaselib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lbaselib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lbaselib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lbitlib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lbitlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lbitlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lbitlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lcode.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcorolib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lcorolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lcorolib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lcorolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lctype.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldblib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldblib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldblib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldblib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldebug.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldo.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldump.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ldump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ldump.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ldump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lfunc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lgc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/linit.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/linit.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/linit.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/linit.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/liolib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/liolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/liolib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/liolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llex.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/llex.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llex.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/llex.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llex.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/llex.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llex.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/llex.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llimits.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/llimits.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/llimits.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/llimits.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmathlib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lmathlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmathlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lmathlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lmem.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/loadlib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/loadlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/loadlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/loadlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lopcodes.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/loslib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/loslib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/loslib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/loslib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lparser.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lstate.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lstring.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstrlib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lstrlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lstrlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lstrlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ltable.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltablib.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ltablib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltablib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ltablib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/ltm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.hpp b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.hpp
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lua.hpp
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lua.hpp
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/luac.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/luac.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/luac.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/luac.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/luaconf.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/luaconf.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/luaconf.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/luaconf.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lualib.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lualib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lualib.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lualib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lundump.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lvm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.c b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.c
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.h b/src/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.h
rename to src/3P/civetweb/src/third_party/lua-5.2.3/src/lzio.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/Makefile b/src/3P/civetweb/src/third_party/lua-5.2.4/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.2.4/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/README b/src/3P/civetweb/src/third_party/lua-5.2.4/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/README
rename to src/3P/civetweb/src/third_party/lua-5.2.4/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/contents.html b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/contents.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/contents.html
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/contents.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/logo.gif b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/logo.gif
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/logo.gif
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/logo.gif
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.1 b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.1
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.css b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.css
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/lua.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/luac.1 b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/luac.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/luac.1
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/luac.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.css b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.css
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.html b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.html
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/manual.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/osi-certified-72x60.png b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/osi-certified-72x60.png
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/osi-certified-72x60.png
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/osi-certified-72x60.png
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/readme.html b/src/3P/civetweb/src/third_party/lua-5.2.4/doc/readme.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/doc/readme.html
rename to src/3P/civetweb/src/third_party/lua-5.2.4/doc/readme.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/Makefile b/src/3P/civetweb/src/third_party/lua-5.2.4/src/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lapi.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lauxlib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lbaselib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lbaselib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lbaselib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lbaselib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lbitlib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lbitlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lbitlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lbitlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lcode.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcorolib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lcorolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lcorolib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lcorolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lctype.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldblib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldblib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldblib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldblib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldebug.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldo.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldump.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ldump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ldump.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ldump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lfunc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lgc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/linit.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/linit.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/linit.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/linit.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/liolib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/liolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/liolib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/liolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llex.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/llex.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llex.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/llex.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llex.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/llex.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llex.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/llex.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llimits.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/llimits.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/llimits.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/llimits.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmathlib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lmathlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmathlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lmathlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lmem.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/loadlib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/loadlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/loadlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/loadlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lopcodes.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/loslib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/loslib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/loslib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/loslib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lparser.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lstate.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lstring.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstrlib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lstrlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lstrlib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lstrlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ltable.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltablib.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ltablib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltablib.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ltablib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/ltm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.hpp b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.hpp
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lua.hpp
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lua.hpp
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/luac.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/luac.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/luac.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/luac.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/luaconf.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/luaconf.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/luaconf.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/luaconf.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lualib.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lualib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lualib.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lualib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lundump.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lvm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.c b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.c
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.h b/src/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.h
rename to src/3P/civetweb/src/third_party/lua-5.2.4/src/lzio.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/Makefile b/src/3P/civetweb/src/third_party/lua-5.3.1/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.3.1/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/README b/src/3P/civetweb/src/third_party/lua-5.3.1/README
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/README
rename to src/3P/civetweb/src/third_party/lua-5.3.1/README
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/contents.html b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/contents.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/contents.html
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/contents.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/index.css b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/index.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/index.css
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/index.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/logo.gif b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/logo.gif
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/logo.gif
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/logo.gif
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.1 b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.1
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.css b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.css
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/lua.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/luac.1 b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/luac.1
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/luac.1
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/luac.1
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.css b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.css
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.css
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.css
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.html b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.html
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/manual.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/osi-certified-72x60.png b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/osi-certified-72x60.png
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/osi-certified-72x60.png
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/osi-certified-72x60.png
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/readme.html b/src/3P/civetweb/src/third_party/lua-5.3.1/doc/readme.html
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/doc/readme.html
rename to src/3P/civetweb/src/third_party/lua-5.3.1/doc/readme.html
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/Makefile b/src/3P/civetweb/src/third_party/lua-5.3.1/src/Makefile
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/Makefile
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/Makefile
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lapi.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lauxlib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lbaselib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lbaselib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lbaselib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lbaselib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lbitlib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lbitlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lbitlib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lbitlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lcode.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcorolib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lcorolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lcorolib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lcorolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lctype.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldblib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldblib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldblib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldblib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldebug.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldo.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldump.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ldump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ldump.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ldump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lfunc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lgc.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/linit.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/linit.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/linit.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/linit.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/liolib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/liolib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/liolib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/liolib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llex.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/llex.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llex.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/llex.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llex.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/llex.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llex.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/llex.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llimits.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/llimits.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/llimits.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/llimits.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmathlib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lmathlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmathlib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lmathlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lmem.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/loadlib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/loadlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/loadlib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/loadlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lobject.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lopcodes.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/loslib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/loslib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/loslib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/loslib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lparser.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lprefix.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lprefix.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lprefix.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lprefix.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lstate.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lstring.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstrlib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lstrlib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lstrlib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lstrlib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ltable.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltablib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ltablib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltablib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ltablib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/ltm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.hpp b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.hpp
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lua.hpp
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lua.hpp
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/luac.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/luac.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/luac.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/luac.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/luaconf.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/luaconf.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/luaconf.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/luaconf.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lualib.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lualib.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lualib.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lualib.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lundump.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lutf8lib.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lutf8lib.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lutf8lib.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lutf8lib.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lvm.h
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.c b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.c
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.c
diff --git a/deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.h b/src/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.h
rename to src/3P/civetweb/src/third_party/lua-5.3.1/src/lzio.h
diff --git a/deprecated/3P/civetweb/src/third_party/sqlite3.c b/src/3P/civetweb/src/third_party/sqlite3.c
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/sqlite3.c
rename to src/3P/civetweb/src/third_party/sqlite3.c
diff --git a/deprecated/3P/civetweb/src/third_party/sqlite3.h b/src/3P/civetweb/src/third_party/sqlite3.h
similarity index 100%
rename from deprecated/3P/civetweb/src/third_party/sqlite3.h
rename to src/3P/civetweb/src/third_party/sqlite3.h
diff --git a/deprecated/3P/civetweb/src/timer.inl b/src/3P/civetweb/src/timer.inl
similarity index 100%
rename from deprecated/3P/civetweb/src/timer.inl
rename to src/3P/civetweb/src/timer.inl
diff --git a/deprecated/3P/civetweb/test/.leading.dot.txt b/src/3P/civetweb/test/.leading.dot.txt
similarity index 100%
rename from deprecated/3P/civetweb/test/.leading.dot.txt
rename to src/3P/civetweb/test/.leading.dot.txt
diff --git a/deprecated/3P/civetweb/test/1000images.lua b/src/3P/civetweb/test/1000images.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/1000images.lua
rename to src/3P/civetweb/test/1000images.lua
diff --git a/deprecated/3P/civetweb/test/100images.htm b/src/3P/civetweb/test/100images.htm
similarity index 100%
rename from deprecated/3P/civetweb/test/100images.htm
rename to src/3P/civetweb/test/100images.htm
diff --git a/deprecated/3P/civetweb/test/CMakeLists.txt b/src/3P/civetweb/test/CMakeLists.txt
similarity index 100%
rename from deprecated/3P/civetweb/test/CMakeLists.txt
rename to src/3P/civetweb/test/CMakeLists.txt
diff --git a/deprecated/3P/civetweb/test/HugeText.lua b/src/3P/civetweb/test/HugeText.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/HugeText.lua
rename to src/3P/civetweb/test/HugeText.lua
diff --git a/deprecated/3P/civetweb/test/MakefileTest.mk b/src/3P/civetweb/test/MakefileTest.mk
similarity index 100%
rename from deprecated/3P/civetweb/test/MakefileTest.mk
rename to src/3P/civetweb/test/MakefileTest.mk
diff --git a/deprecated/3P/civetweb/test/MethodTest.xhtml b/src/3P/civetweb/test/MethodTest.xhtml
similarity index 100%
rename from deprecated/3P/civetweb/test/MethodTest.xhtml
rename to src/3P/civetweb/test/MethodTest.xhtml
diff --git a/deprecated/3P/civetweb/test/README.md b/src/3P/civetweb/test/README.md
similarity index 100%
rename from deprecated/3P/civetweb/test/README.md
rename to src/3P/civetweb/test/README.md
diff --git a/deprecated/3P/civetweb/test/ajax/echo.cgi b/src/3P/civetweb/test/ajax/echo.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/echo.cgi
rename to src/3P/civetweb/test/ajax/echo.cgi
diff --git a/deprecated/3P/civetweb/test/ajax/echo.cgi.old b/src/3P/civetweb/test/ajax/echo.cgi.old
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/echo.cgi.old
rename to src/3P/civetweb/test/ajax/echo.cgi.old
diff --git a/deprecated/3P/civetweb/test/ajax/echo.lp b/src/3P/civetweb/test/ajax/echo.lp
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/echo.lp
rename to src/3P/civetweb/test/ajax/echo.lp
diff --git a/deprecated/3P/civetweb/test/ajax/echo.lua b/src/3P/civetweb/test/ajax/echo.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/echo.lua
rename to src/3P/civetweb/test/ajax/echo.lua
diff --git a/deprecated/3P/civetweb/test/ajax/jquery.js b/src/3P/civetweb/test/ajax/jquery.js
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/jquery.js
rename to src/3P/civetweb/test/ajax/jquery.js
diff --git a/deprecated/3P/civetweb/test/ajax/test.html b/src/3P/civetweb/test/ajax/test.html
similarity index 100%
rename from deprecated/3P/civetweb/test/ajax/test.html
rename to src/3P/civetweb/test/ajax/test.html
diff --git a/deprecated/3P/civetweb/test/all_build_flags.pl b/src/3P/civetweb/test/all_build_flags.pl
similarity index 100%
rename from deprecated/3P/civetweb/test/all_build_flags.pl
rename to src/3P/civetweb/test/all_build_flags.pl
diff --git a/deprecated/3P/civetweb/test/bad.cgi b/src/3P/civetweb/test/bad.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/bad.cgi
rename to src/3P/civetweb/test/bad.cgi
diff --git a/deprecated/3P/civetweb/test/bad2.cgi b/src/3P/civetweb/test/bad2.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/bad2.cgi
rename to src/3P/civetweb/test/bad2.cgi
diff --git a/deprecated/3P/civetweb/test/civetweb_check.h b/src/3P/civetweb/test/civetweb_check.h
similarity index 100%
rename from deprecated/3P/civetweb/test/civetweb_check.h
rename to src/3P/civetweb/test/civetweb_check.h
diff --git a/deprecated/3P/civetweb/test/cors.html b/src/3P/civetweb/test/cors.html
similarity index 100%
rename from deprecated/3P/civetweb/test/cors.html
rename to src/3P/civetweb/test/cors.html
diff --git a/deprecated/3P/civetweb/test/cors.reply.html b/src/3P/civetweb/test/cors.reply.html
similarity index 100%
rename from deprecated/3P/civetweb/test/cors.reply.html
rename to src/3P/civetweb/test/cors.reply.html
diff --git a/deprecated/3P/civetweb/test/cors.reply.lua b/src/3P/civetweb/test/cors.reply.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/cors.reply.lua
rename to src/3P/civetweb/test/cors.reply.lua
diff --git a/deprecated/3P/civetweb/test/cors.reply.shtml b/src/3P/civetweb/test/cors.reply.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/cors.reply.shtml
rename to src/3P/civetweb/test/cors.reply.shtml
diff --git a/deprecated/3P/civetweb/test/dir with spaces/hello.cgi b/src/3P/civetweb/test/dir with spaces/hello.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/dir with spaces/hello.cgi
rename to src/3P/civetweb/test/dir with spaces/hello.cgi
diff --git a/deprecated/3P/civetweb/test/embed.c b/src/3P/civetweb/test/embed.c
similarity index 100%
rename from deprecated/3P/civetweb/test/embed.c
rename to src/3P/civetweb/test/embed.c
diff --git a/deprecated/3P/civetweb/test/env.cgi b/src/3P/civetweb/test/env.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/env.cgi
rename to src/3P/civetweb/test/env.cgi
diff --git a/deprecated/3P/civetweb/test/error.lua b/src/3P/civetweb/test/error.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/error.lua
rename to src/3P/civetweb/test/error.lua
diff --git a/deprecated/3P/civetweb/test/error404.htm b/src/3P/civetweb/test/error404.htm
similarity index 100%
rename from deprecated/3P/civetweb/test/error404.htm
rename to src/3P/civetweb/test/error404.htm
diff --git a/deprecated/3P/civetweb/test/exit.lua b/src/3P/civetweb/test/exit.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/exit.lua
rename to src/3P/civetweb/test/exit.lua
diff --git a/deprecated/3P/civetweb/test/exploit.pl b/src/3P/civetweb/test/exploit.pl
similarity index 100%
rename from deprecated/3P/civetweb/test/exploit.pl
rename to src/3P/civetweb/test/exploit.pl
diff --git a/deprecated/3P/civetweb/test/form.html b/src/3P/civetweb/test/form.html
similarity index 100%
rename from deprecated/3P/civetweb/test/form.html
rename to src/3P/civetweb/test/form.html
diff --git a/deprecated/3P/civetweb/test/handle_form.lua b/src/3P/civetweb/test/handle_form.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/handle_form.lua
rename to src/3P/civetweb/test/handle_form.lua
diff --git a/deprecated/3P/civetweb/test/hello.cgi b/src/3P/civetweb/test/hello.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/hello.cgi
rename to src/3P/civetweb/test/hello.cgi
diff --git a/deprecated/3P/civetweb/test/hello.txt b/src/3P/civetweb/test/hello.txt
similarity index 100%
rename from deprecated/3P/civetweb/test/hello.txt
rename to src/3P/civetweb/test/hello.txt
diff --git a/deprecated/3P/civetweb/test/hello_gz.txt.gz b/src/3P/civetweb/test/hello_gz.txt.gz
similarity index 100%
rename from deprecated/3P/civetweb/test/hello_gz.txt.gz
rename to src/3P/civetweb/test/hello_gz.txt.gz
diff --git a/deprecated/3P/civetweb/test/hello_gz_unzipped.txt b/src/3P/civetweb/test/hello_gz_unzipped.txt
similarity index 100%
rename from deprecated/3P/civetweb/test/hello_gz_unzipped.txt
rename to src/3P/civetweb/test/hello_gz_unzipped.txt
diff --git a/deprecated/3P/civetweb/test/html_esc.lua b/src/3P/civetweb/test/html_esc.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/html_esc.lua
rename to src/3P/civetweb/test/html_esc.lua
diff --git a/deprecated/3P/civetweb/test/imagetest/00.png b/src/3P/civetweb/test/imagetest/00.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/00.png
rename to src/3P/civetweb/test/imagetest/00.png
diff --git a/deprecated/3P/civetweb/test/imagetest/01.png b/src/3P/civetweb/test/imagetest/01.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/01.png
rename to src/3P/civetweb/test/imagetest/01.png
diff --git a/deprecated/3P/civetweb/test/imagetest/02.png b/src/3P/civetweb/test/imagetest/02.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/02.png
rename to src/3P/civetweb/test/imagetest/02.png
diff --git a/deprecated/3P/civetweb/test/imagetest/03.png b/src/3P/civetweb/test/imagetest/03.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/03.png
rename to src/3P/civetweb/test/imagetest/03.png
diff --git a/deprecated/3P/civetweb/test/imagetest/04.png b/src/3P/civetweb/test/imagetest/04.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/04.png
rename to src/3P/civetweb/test/imagetest/04.png
diff --git a/deprecated/3P/civetweb/test/imagetest/05.png b/src/3P/civetweb/test/imagetest/05.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/05.png
rename to src/3P/civetweb/test/imagetest/05.png
diff --git a/deprecated/3P/civetweb/test/imagetest/06.png b/src/3P/civetweb/test/imagetest/06.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/06.png
rename to src/3P/civetweb/test/imagetest/06.png
diff --git a/deprecated/3P/civetweb/test/imagetest/07.png b/src/3P/civetweb/test/imagetest/07.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/07.png
rename to src/3P/civetweb/test/imagetest/07.png
diff --git a/deprecated/3P/civetweb/test/imagetest/08.png b/src/3P/civetweb/test/imagetest/08.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/08.png
rename to src/3P/civetweb/test/imagetest/08.png
diff --git a/deprecated/3P/civetweb/test/imagetest/09.png b/src/3P/civetweb/test/imagetest/09.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/09.png
rename to src/3P/civetweb/test/imagetest/09.png
diff --git a/deprecated/3P/civetweb/test/imagetest/10.png b/src/3P/civetweb/test/imagetest/10.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/10.png
rename to src/3P/civetweb/test/imagetest/10.png
diff --git a/deprecated/3P/civetweb/test/imagetest/11.png b/src/3P/civetweb/test/imagetest/11.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/11.png
rename to src/3P/civetweb/test/imagetest/11.png
diff --git a/deprecated/3P/civetweb/test/imagetest/12.png b/src/3P/civetweb/test/imagetest/12.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/12.png
rename to src/3P/civetweb/test/imagetest/12.png
diff --git a/deprecated/3P/civetweb/test/imagetest/13.png b/src/3P/civetweb/test/imagetest/13.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/13.png
rename to src/3P/civetweb/test/imagetest/13.png
diff --git a/deprecated/3P/civetweb/test/imagetest/14.png b/src/3P/civetweb/test/imagetest/14.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/14.png
rename to src/3P/civetweb/test/imagetest/14.png
diff --git a/deprecated/3P/civetweb/test/imagetest/15.png b/src/3P/civetweb/test/imagetest/15.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/15.png
rename to src/3P/civetweb/test/imagetest/15.png
diff --git a/deprecated/3P/civetweb/test/imagetest/16.png b/src/3P/civetweb/test/imagetest/16.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/16.png
rename to src/3P/civetweb/test/imagetest/16.png
diff --git a/deprecated/3P/civetweb/test/imagetest/17.png b/src/3P/civetweb/test/imagetest/17.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/17.png
rename to src/3P/civetweb/test/imagetest/17.png
diff --git a/deprecated/3P/civetweb/test/imagetest/18.png b/src/3P/civetweb/test/imagetest/18.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/18.png
rename to src/3P/civetweb/test/imagetest/18.png
diff --git a/deprecated/3P/civetweb/test/imagetest/19.png b/src/3P/civetweb/test/imagetest/19.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/19.png
rename to src/3P/civetweb/test/imagetest/19.png
diff --git a/deprecated/3P/civetweb/test/imagetest/20.png b/src/3P/civetweb/test/imagetest/20.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/20.png
rename to src/3P/civetweb/test/imagetest/20.png
diff --git a/deprecated/3P/civetweb/test/imagetest/21.png b/src/3P/civetweb/test/imagetest/21.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/21.png
rename to src/3P/civetweb/test/imagetest/21.png
diff --git a/deprecated/3P/civetweb/test/imagetest/22.png b/src/3P/civetweb/test/imagetest/22.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/22.png
rename to src/3P/civetweb/test/imagetest/22.png
diff --git a/deprecated/3P/civetweb/test/imagetest/23.png b/src/3P/civetweb/test/imagetest/23.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/23.png
rename to src/3P/civetweb/test/imagetest/23.png
diff --git a/deprecated/3P/civetweb/test/imagetest/24.png b/src/3P/civetweb/test/imagetest/24.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/24.png
rename to src/3P/civetweb/test/imagetest/24.png
diff --git a/deprecated/3P/civetweb/test/imagetest/25.png b/src/3P/civetweb/test/imagetest/25.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/25.png
rename to src/3P/civetweb/test/imagetest/25.png
diff --git a/deprecated/3P/civetweb/test/imagetest/26.png b/src/3P/civetweb/test/imagetest/26.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/26.png
rename to src/3P/civetweb/test/imagetest/26.png
diff --git a/deprecated/3P/civetweb/test/imagetest/27.png b/src/3P/civetweb/test/imagetest/27.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/27.png
rename to src/3P/civetweb/test/imagetest/27.png
diff --git a/deprecated/3P/civetweb/test/imagetest/28.png b/src/3P/civetweb/test/imagetest/28.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/28.png
rename to src/3P/civetweb/test/imagetest/28.png
diff --git a/deprecated/3P/civetweb/test/imagetest/29.png b/src/3P/civetweb/test/imagetest/29.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/29.png
rename to src/3P/civetweb/test/imagetest/29.png
diff --git a/deprecated/3P/civetweb/test/imagetest/30.png b/src/3P/civetweb/test/imagetest/30.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/30.png
rename to src/3P/civetweb/test/imagetest/30.png
diff --git a/deprecated/3P/civetweb/test/imagetest/31.png b/src/3P/civetweb/test/imagetest/31.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/31.png
rename to src/3P/civetweb/test/imagetest/31.png
diff --git a/deprecated/3P/civetweb/test/imagetest/32.png b/src/3P/civetweb/test/imagetest/32.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/32.png
rename to src/3P/civetweb/test/imagetest/32.png
diff --git a/deprecated/3P/civetweb/test/imagetest/33.png b/src/3P/civetweb/test/imagetest/33.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/33.png
rename to src/3P/civetweb/test/imagetest/33.png
diff --git a/deprecated/3P/civetweb/test/imagetest/34.png b/src/3P/civetweb/test/imagetest/34.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/34.png
rename to src/3P/civetweb/test/imagetest/34.png
diff --git a/deprecated/3P/civetweb/test/imagetest/35.png b/src/3P/civetweb/test/imagetest/35.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/35.png
rename to src/3P/civetweb/test/imagetest/35.png
diff --git a/deprecated/3P/civetweb/test/imagetest/36.png b/src/3P/civetweb/test/imagetest/36.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/36.png
rename to src/3P/civetweb/test/imagetest/36.png
diff --git a/deprecated/3P/civetweb/test/imagetest/37.png b/src/3P/civetweb/test/imagetest/37.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/37.png
rename to src/3P/civetweb/test/imagetest/37.png
diff --git a/deprecated/3P/civetweb/test/imagetest/38.png b/src/3P/civetweb/test/imagetest/38.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/38.png
rename to src/3P/civetweb/test/imagetest/38.png
diff --git a/deprecated/3P/civetweb/test/imagetest/39.png b/src/3P/civetweb/test/imagetest/39.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/39.png
rename to src/3P/civetweb/test/imagetest/39.png
diff --git a/deprecated/3P/civetweb/test/imagetest/40.png b/src/3P/civetweb/test/imagetest/40.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/40.png
rename to src/3P/civetweb/test/imagetest/40.png
diff --git a/deprecated/3P/civetweb/test/imagetest/41.png b/src/3P/civetweb/test/imagetest/41.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/41.png
rename to src/3P/civetweb/test/imagetest/41.png
diff --git a/deprecated/3P/civetweb/test/imagetest/42.png b/src/3P/civetweb/test/imagetest/42.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/42.png
rename to src/3P/civetweb/test/imagetest/42.png
diff --git a/deprecated/3P/civetweb/test/imagetest/43.png b/src/3P/civetweb/test/imagetest/43.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/43.png
rename to src/3P/civetweb/test/imagetest/43.png
diff --git a/deprecated/3P/civetweb/test/imagetest/44.png b/src/3P/civetweb/test/imagetest/44.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/44.png
rename to src/3P/civetweb/test/imagetest/44.png
diff --git a/deprecated/3P/civetweb/test/imagetest/45.png b/src/3P/civetweb/test/imagetest/45.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/45.png
rename to src/3P/civetweb/test/imagetest/45.png
diff --git a/deprecated/3P/civetweb/test/imagetest/46.png b/src/3P/civetweb/test/imagetest/46.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/46.png
rename to src/3P/civetweb/test/imagetest/46.png
diff --git a/deprecated/3P/civetweb/test/imagetest/47.png b/src/3P/civetweb/test/imagetest/47.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/47.png
rename to src/3P/civetweb/test/imagetest/47.png
diff --git a/deprecated/3P/civetweb/test/imagetest/48.png b/src/3P/civetweb/test/imagetest/48.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/48.png
rename to src/3P/civetweb/test/imagetest/48.png
diff --git a/deprecated/3P/civetweb/test/imagetest/49.png b/src/3P/civetweb/test/imagetest/49.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/49.png
rename to src/3P/civetweb/test/imagetest/49.png
diff --git a/deprecated/3P/civetweb/test/imagetest/50.png b/src/3P/civetweb/test/imagetest/50.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/50.png
rename to src/3P/civetweb/test/imagetest/50.png
diff --git a/deprecated/3P/civetweb/test/imagetest/51.png b/src/3P/civetweb/test/imagetest/51.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/51.png
rename to src/3P/civetweb/test/imagetest/51.png
diff --git a/deprecated/3P/civetweb/test/imagetest/52.png b/src/3P/civetweb/test/imagetest/52.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/52.png
rename to src/3P/civetweb/test/imagetest/52.png
diff --git a/deprecated/3P/civetweb/test/imagetest/53.png b/src/3P/civetweb/test/imagetest/53.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/53.png
rename to src/3P/civetweb/test/imagetest/53.png
diff --git a/deprecated/3P/civetweb/test/imagetest/54.png b/src/3P/civetweb/test/imagetest/54.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/54.png
rename to src/3P/civetweb/test/imagetest/54.png
diff --git a/deprecated/3P/civetweb/test/imagetest/55.png b/src/3P/civetweb/test/imagetest/55.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/55.png
rename to src/3P/civetweb/test/imagetest/55.png
diff --git a/deprecated/3P/civetweb/test/imagetest/56.png b/src/3P/civetweb/test/imagetest/56.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/56.png
rename to src/3P/civetweb/test/imagetest/56.png
diff --git a/deprecated/3P/civetweb/test/imagetest/57.png b/src/3P/civetweb/test/imagetest/57.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/57.png
rename to src/3P/civetweb/test/imagetest/57.png
diff --git a/deprecated/3P/civetweb/test/imagetest/58.png b/src/3P/civetweb/test/imagetest/58.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/58.png
rename to src/3P/civetweb/test/imagetest/58.png
diff --git a/deprecated/3P/civetweb/test/imagetest/59.png b/src/3P/civetweb/test/imagetest/59.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/59.png
rename to src/3P/civetweb/test/imagetest/59.png
diff --git a/deprecated/3P/civetweb/test/imagetest/60.png b/src/3P/civetweb/test/imagetest/60.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/60.png
rename to src/3P/civetweb/test/imagetest/60.png
diff --git a/deprecated/3P/civetweb/test/imagetest/61.png b/src/3P/civetweb/test/imagetest/61.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/61.png
rename to src/3P/civetweb/test/imagetest/61.png
diff --git a/deprecated/3P/civetweb/test/imagetest/62.png b/src/3P/civetweb/test/imagetest/62.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/62.png
rename to src/3P/civetweb/test/imagetest/62.png
diff --git a/deprecated/3P/civetweb/test/imagetest/63.png b/src/3P/civetweb/test/imagetest/63.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/63.png
rename to src/3P/civetweb/test/imagetest/63.png
diff --git a/deprecated/3P/civetweb/test/imagetest/64.png b/src/3P/civetweb/test/imagetest/64.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/64.png
rename to src/3P/civetweb/test/imagetest/64.png
diff --git a/deprecated/3P/civetweb/test/imagetest/65.png b/src/3P/civetweb/test/imagetest/65.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/65.png
rename to src/3P/civetweb/test/imagetest/65.png
diff --git a/deprecated/3P/civetweb/test/imagetest/66.png b/src/3P/civetweb/test/imagetest/66.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/66.png
rename to src/3P/civetweb/test/imagetest/66.png
diff --git a/deprecated/3P/civetweb/test/imagetest/67.png b/src/3P/civetweb/test/imagetest/67.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/67.png
rename to src/3P/civetweb/test/imagetest/67.png
diff --git a/deprecated/3P/civetweb/test/imagetest/68.png b/src/3P/civetweb/test/imagetest/68.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/68.png
rename to src/3P/civetweb/test/imagetest/68.png
diff --git a/deprecated/3P/civetweb/test/imagetest/69.png b/src/3P/civetweb/test/imagetest/69.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/69.png
rename to src/3P/civetweb/test/imagetest/69.png
diff --git a/deprecated/3P/civetweb/test/imagetest/70.png b/src/3P/civetweb/test/imagetest/70.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/70.png
rename to src/3P/civetweb/test/imagetest/70.png
diff --git a/deprecated/3P/civetweb/test/imagetest/71.png b/src/3P/civetweb/test/imagetest/71.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/71.png
rename to src/3P/civetweb/test/imagetest/71.png
diff --git a/deprecated/3P/civetweb/test/imagetest/72.png b/src/3P/civetweb/test/imagetest/72.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/72.png
rename to src/3P/civetweb/test/imagetest/72.png
diff --git a/deprecated/3P/civetweb/test/imagetest/73.png b/src/3P/civetweb/test/imagetest/73.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/73.png
rename to src/3P/civetweb/test/imagetest/73.png
diff --git a/deprecated/3P/civetweb/test/imagetest/74.png b/src/3P/civetweb/test/imagetest/74.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/74.png
rename to src/3P/civetweb/test/imagetest/74.png
diff --git a/deprecated/3P/civetweb/test/imagetest/75.png b/src/3P/civetweb/test/imagetest/75.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/75.png
rename to src/3P/civetweb/test/imagetest/75.png
diff --git a/deprecated/3P/civetweb/test/imagetest/76.png b/src/3P/civetweb/test/imagetest/76.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/76.png
rename to src/3P/civetweb/test/imagetest/76.png
diff --git a/deprecated/3P/civetweb/test/imagetest/77.png b/src/3P/civetweb/test/imagetest/77.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/77.png
rename to src/3P/civetweb/test/imagetest/77.png
diff --git a/deprecated/3P/civetweb/test/imagetest/78.png b/src/3P/civetweb/test/imagetest/78.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/78.png
rename to src/3P/civetweb/test/imagetest/78.png
diff --git a/deprecated/3P/civetweb/test/imagetest/79.png b/src/3P/civetweb/test/imagetest/79.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/79.png
rename to src/3P/civetweb/test/imagetest/79.png
diff --git a/deprecated/3P/civetweb/test/imagetest/80.png b/src/3P/civetweb/test/imagetest/80.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/80.png
rename to src/3P/civetweb/test/imagetest/80.png
diff --git a/deprecated/3P/civetweb/test/imagetest/81.png b/src/3P/civetweb/test/imagetest/81.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/81.png
rename to src/3P/civetweb/test/imagetest/81.png
diff --git a/deprecated/3P/civetweb/test/imagetest/82.png b/src/3P/civetweb/test/imagetest/82.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/82.png
rename to src/3P/civetweb/test/imagetest/82.png
diff --git a/deprecated/3P/civetweb/test/imagetest/83.png b/src/3P/civetweb/test/imagetest/83.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/83.png
rename to src/3P/civetweb/test/imagetest/83.png
diff --git a/deprecated/3P/civetweb/test/imagetest/84.png b/src/3P/civetweb/test/imagetest/84.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/84.png
rename to src/3P/civetweb/test/imagetest/84.png
diff --git a/deprecated/3P/civetweb/test/imagetest/85.png b/src/3P/civetweb/test/imagetest/85.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/85.png
rename to src/3P/civetweb/test/imagetest/85.png
diff --git a/deprecated/3P/civetweb/test/imagetest/86.png b/src/3P/civetweb/test/imagetest/86.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/86.png
rename to src/3P/civetweb/test/imagetest/86.png
diff --git a/deprecated/3P/civetweb/test/imagetest/87.png b/src/3P/civetweb/test/imagetest/87.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/87.png
rename to src/3P/civetweb/test/imagetest/87.png
diff --git a/deprecated/3P/civetweb/test/imagetest/88.png b/src/3P/civetweb/test/imagetest/88.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/88.png
rename to src/3P/civetweb/test/imagetest/88.png
diff --git a/deprecated/3P/civetweb/test/imagetest/89.png b/src/3P/civetweb/test/imagetest/89.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/89.png
rename to src/3P/civetweb/test/imagetest/89.png
diff --git a/deprecated/3P/civetweb/test/imagetest/90.png b/src/3P/civetweb/test/imagetest/90.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/90.png
rename to src/3P/civetweb/test/imagetest/90.png
diff --git a/deprecated/3P/civetweb/test/imagetest/91.png b/src/3P/civetweb/test/imagetest/91.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/91.png
rename to src/3P/civetweb/test/imagetest/91.png
diff --git a/deprecated/3P/civetweb/test/imagetest/92.png b/src/3P/civetweb/test/imagetest/92.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/92.png
rename to src/3P/civetweb/test/imagetest/92.png
diff --git a/deprecated/3P/civetweb/test/imagetest/93.png b/src/3P/civetweb/test/imagetest/93.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/93.png
rename to src/3P/civetweb/test/imagetest/93.png
diff --git a/deprecated/3P/civetweb/test/imagetest/94.png b/src/3P/civetweb/test/imagetest/94.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/94.png
rename to src/3P/civetweb/test/imagetest/94.png
diff --git a/deprecated/3P/civetweb/test/imagetest/95.png b/src/3P/civetweb/test/imagetest/95.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/95.png
rename to src/3P/civetweb/test/imagetest/95.png
diff --git a/deprecated/3P/civetweb/test/imagetest/96.png b/src/3P/civetweb/test/imagetest/96.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/96.png
rename to src/3P/civetweb/test/imagetest/96.png
diff --git a/deprecated/3P/civetweb/test/imagetest/97.png b/src/3P/civetweb/test/imagetest/97.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/97.png
rename to src/3P/civetweb/test/imagetest/97.png
diff --git a/deprecated/3P/civetweb/test/imagetest/98.png b/src/3P/civetweb/test/imagetest/98.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/98.png
rename to src/3P/civetweb/test/imagetest/98.png
diff --git a/deprecated/3P/civetweb/test/imagetest/99.png b/src/3P/civetweb/test/imagetest/99.png
similarity index 100%
rename from deprecated/3P/civetweb/test/imagetest/99.png
rename to src/3P/civetweb/test/imagetest/99.png
diff --git a/deprecated/3P/civetweb/test/linux.cgi b/src/3P/civetweb/test/linux.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/linux.cgi
rename to src/3P/civetweb/test/linux.cgi
diff --git a/deprecated/3P/civetweb/test/linux_fail.cgi b/src/3P/civetweb/test/linux_fail.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/linux_fail.cgi
rename to src/3P/civetweb/test/linux_fail.cgi
diff --git a/deprecated/3P/civetweb/test/linux_fail_silent.cgi b/src/3P/civetweb/test/linux_fail_silent.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/linux_fail_silent.cgi
rename to src/3P/civetweb/test/linux_fail_silent.cgi
diff --git a/deprecated/3P/civetweb/test/lua_preload_file.lua b/src/3P/civetweb/test/lua_preload_file.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/lua_preload_file.lua
rename to src/3P/civetweb/test/lua_preload_file.lua
diff --git a/deprecated/3P/civetweb/test/main.c b/src/3P/civetweb/test/main.c
similarity index 100%
rename from deprecated/3P/civetweb/test/main.c
rename to src/3P/civetweb/test/main.c
diff --git a/deprecated/3P/civetweb/test/page.lp b/src/3P/civetweb/test/page.lp
similarity index 100%
rename from deprecated/3P/civetweb/test/page.lp
rename to src/3P/civetweb/test/page.lp
diff --git a/deprecated/3P/civetweb/test/page.lua b/src/3P/civetweb/test/page.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page.lua
rename to src/3P/civetweb/test/page.lua
diff --git a/deprecated/3P/civetweb/test/page.ssjs b/src/3P/civetweb/test/page.ssjs
similarity index 100%
rename from deprecated/3P/civetweb/test/page.ssjs
rename to src/3P/civetweb/test/page.ssjs
diff --git a/deprecated/3P/civetweb/test/page2.lp b/src/3P/civetweb/test/page2.lp
similarity index 100%
rename from deprecated/3P/civetweb/test/page2.lp
rename to src/3P/civetweb/test/page2.lp
diff --git a/deprecated/3P/civetweb/test/page2.lua b/src/3P/civetweb/test/page2.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page2.lua
rename to src/3P/civetweb/test/page2.lua
diff --git a/deprecated/3P/civetweb/test/page2.ssjs b/src/3P/civetweb/test/page2.ssjs
similarity index 100%
rename from deprecated/3P/civetweb/test/page2.ssjs
rename to src/3P/civetweb/test/page2.ssjs
diff --git a/deprecated/3P/civetweb/test/page3.lua b/src/3P/civetweb/test/page3.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page3.lua
rename to src/3P/civetweb/test/page3.lua
diff --git a/deprecated/3P/civetweb/test/page3.ssjs b/src/3P/civetweb/test/page3.ssjs
similarity index 100%
rename from deprecated/3P/civetweb/test/page3.ssjs
rename to src/3P/civetweb/test/page3.ssjs
diff --git a/deprecated/3P/civetweb/test/page4.lua b/src/3P/civetweb/test/page4.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page4.lua
rename to src/3P/civetweb/test/page4.lua
diff --git a/deprecated/3P/civetweb/test/page_keep_alive.lua b/src/3P/civetweb/test/page_keep_alive.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page_keep_alive.lua
rename to src/3P/civetweb/test/page_keep_alive.lua
diff --git a/deprecated/3P/civetweb/test/page_keep_alive_chunked.lua b/src/3P/civetweb/test/page_keep_alive_chunked.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/page_keep_alive_chunked.lua
rename to src/3P/civetweb/test/page_keep_alive_chunked.lua
diff --git a/deprecated/3P/civetweb/test/passfile b/src/3P/civetweb/test/passfile
similarity index 100%
rename from deprecated/3P/civetweb/test/passfile
rename to src/3P/civetweb/test/passfile
diff --git a/deprecated/3P/civetweb/test/prime.ssjs b/src/3P/civetweb/test/prime.ssjs
similarity index 100%
rename from deprecated/3P/civetweb/test/prime.ssjs
rename to src/3P/civetweb/test/prime.ssjs
diff --git a/deprecated/3P/civetweb/test/private.c b/src/3P/civetweb/test/private.c
similarity index 100%
rename from deprecated/3P/civetweb/test/private.c
rename to src/3P/civetweb/test/private.c
diff --git a/deprecated/3P/civetweb/test/private.h b/src/3P/civetweb/test/private.h
similarity index 100%
rename from deprecated/3P/civetweb/test/private.h
rename to src/3P/civetweb/test/private.h
diff --git a/deprecated/3P/civetweb/test/private_exe.c b/src/3P/civetweb/test/private_exe.c
similarity index 100%
rename from deprecated/3P/civetweb/test/private_exe.c
rename to src/3P/civetweb/test/private_exe.c
diff --git a/deprecated/3P/civetweb/test/private_exe.h b/src/3P/civetweb/test/private_exe.h
similarity index 100%
rename from deprecated/3P/civetweb/test/private_exe.h
rename to src/3P/civetweb/test/private_exe.h
diff --git a/deprecated/3P/civetweb/test/public_func.c b/src/3P/civetweb/test/public_func.c
similarity index 100%
rename from deprecated/3P/civetweb/test/public_func.c
rename to src/3P/civetweb/test/public_func.c
diff --git a/deprecated/3P/civetweb/test/public_func.h b/src/3P/civetweb/test/public_func.h
similarity index 100%
rename from deprecated/3P/civetweb/test/public_func.h
rename to src/3P/civetweb/test/public_func.h
diff --git a/deprecated/3P/civetweb/test/public_server.c b/src/3P/civetweb/test/public_server.c
similarity index 100%
rename from deprecated/3P/civetweb/test/public_server.c
rename to src/3P/civetweb/test/public_server.c
diff --git a/deprecated/3P/civetweb/test/public_server.h b/src/3P/civetweb/test/public_server.h
similarity index 100%
rename from deprecated/3P/civetweb/test/public_server.h
rename to src/3P/civetweb/test/public_server.h
diff --git a/deprecated/3P/civetweb/test/require_test.lua b/src/3P/civetweb/test/require_test.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/require_test.lua
rename to src/3P/civetweb/test/require_test.lua
diff --git a/deprecated/3P/civetweb/test/resource_script_demo.lua b/src/3P/civetweb/test/resource_script_demo.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/resource_script_demo.lua
rename to src/3P/civetweb/test/resource_script_demo.lua
diff --git a/deprecated/3P/civetweb/test/sh.cgi b/src/3P/civetweb/test/sh.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/sh.cgi
rename to src/3P/civetweb/test/sh.cgi
diff --git a/deprecated/3P/civetweb/test/shared.c b/src/3P/civetweb/test/shared.c
similarity index 100%
rename from deprecated/3P/civetweb/test/shared.c
rename to src/3P/civetweb/test/shared.c
diff --git a/deprecated/3P/civetweb/test/shared.h b/src/3P/civetweb/test/shared.h
similarity index 100%
rename from deprecated/3P/civetweb/test/shared.h
rename to src/3P/civetweb/test/shared.h
diff --git a/deprecated/3P/civetweb/test/ssi1.shtml b/src/3P/civetweb/test/ssi1.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi1.shtml
rename to src/3P/civetweb/test/ssi1.shtml
diff --git a/deprecated/3P/civetweb/test/ssi2.shtml b/src/3P/civetweb/test/ssi2.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi2.shtml
rename to src/3P/civetweb/test/ssi2.shtml
diff --git a/deprecated/3P/civetweb/test/ssi3.shtml b/src/3P/civetweb/test/ssi3.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi3.shtml
rename to src/3P/civetweb/test/ssi3.shtml
diff --git a/deprecated/3P/civetweb/test/ssi4.shtml b/src/3P/civetweb/test/ssi4.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi4.shtml
rename to src/3P/civetweb/test/ssi4.shtml
diff --git a/deprecated/3P/civetweb/test/ssi5.shtml b/src/3P/civetweb/test/ssi5.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi5.shtml
rename to src/3P/civetweb/test/ssi5.shtml
diff --git a/deprecated/3P/civetweb/test/ssi6.shtml b/src/3P/civetweb/test/ssi6.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi6.shtml
rename to src/3P/civetweb/test/ssi6.shtml
diff --git a/deprecated/3P/civetweb/test/ssi7.shtml b/src/3P/civetweb/test/ssi7.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi7.shtml
rename to src/3P/civetweb/test/ssi7.shtml
diff --git a/deprecated/3P/civetweb/test/ssi8.shtml b/src/3P/civetweb/test/ssi8.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi8.shtml
rename to src/3P/civetweb/test/ssi8.shtml
diff --git a/deprecated/3P/civetweb/test/ssi9.shtml b/src/3P/civetweb/test/ssi9.shtml
similarity index 100%
rename from deprecated/3P/civetweb/test/ssi9.shtml
rename to src/3P/civetweb/test/ssi9.shtml
diff --git a/deprecated/3P/civetweb/test/syntax_error.ssjs b/src/3P/civetweb/test/syntax_error.ssjs
similarity index 100%
rename from deprecated/3P/civetweb/test/syntax_error.ssjs
rename to src/3P/civetweb/test/syntax_error.ssjs
diff --git a/deprecated/3P/civetweb/test/test.ico b/src/3P/civetweb/test/test.ico
similarity index 100%
rename from deprecated/3P/civetweb/test/test.ico
rename to src/3P/civetweb/test/test.ico
diff --git a/deprecated/3P/civetweb/test/test.pl b/src/3P/civetweb/test/test.pl
similarity index 100%
rename from deprecated/3P/civetweb/test/test.pl
rename to src/3P/civetweb/test/test.pl
diff --git a/deprecated/3P/civetweb/test/testclient.c b/src/3P/civetweb/test/testclient.c
similarity index 100%
rename from deprecated/3P/civetweb/test/testclient.c
rename to src/3P/civetweb/test/testclient.c
diff --git a/deprecated/3P/civetweb/test/timeout.cgi b/src/3P/civetweb/test/timeout.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/timeout.cgi
rename to src/3P/civetweb/test/timeout.cgi
diff --git a/deprecated/3P/civetweb/test/unit_test.c b/src/3P/civetweb/test/unit_test.c
similarity index 100%
rename from deprecated/3P/civetweb/test/unit_test.c
rename to src/3P/civetweb/test/unit_test.c
diff --git a/deprecated/3P/civetweb/test/websocket.lua b/src/3P/civetweb/test/websocket.lua
similarity index 100%
rename from deprecated/3P/civetweb/test/websocket.lua
rename to src/3P/civetweb/test/websocket.lua
diff --git a/deprecated/3P/civetweb/test/websocket.xhtml b/src/3P/civetweb/test/websocket.xhtml
similarity index 100%
rename from deprecated/3P/civetweb/test/websocket.xhtml
rename to src/3P/civetweb/test/websocket.xhtml
diff --git a/deprecated/3P/civetweb/test/windows.cgi b/src/3P/civetweb/test/windows.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/windows.cgi
rename to src/3P/civetweb/test/windows.cgi
diff --git a/deprecated/3P/civetweb/test/windows.cgi.cmd b/src/3P/civetweb/test/windows.cgi.cmd
similarity index 100%
rename from deprecated/3P/civetweb/test/windows.cgi.cmd
rename to src/3P/civetweb/test/windows.cgi.cmd
diff --git a/deprecated/3P/civetweb/test/windows_fail.cgi b/src/3P/civetweb/test/windows_fail.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/windows_fail.cgi
rename to src/3P/civetweb/test/windows_fail.cgi
diff --git a/deprecated/3P/civetweb/test/windows_fail.cgi.cmd b/src/3P/civetweb/test/windows_fail.cgi.cmd
similarity index 100%
rename from deprecated/3P/civetweb/test/windows_fail.cgi.cmd
rename to src/3P/civetweb/test/windows_fail.cgi.cmd
diff --git a/deprecated/3P/civetweb/test/windows_fail_silent.cgi b/src/3P/civetweb/test/windows_fail_silent.cgi
similarity index 100%
rename from deprecated/3P/civetweb/test/windows_fail_silent.cgi
rename to src/3P/civetweb/test/windows_fail_silent.cgi
diff --git a/deprecated/3P/civetweb/test/windows_fail_silent.cgi.cmd b/src/3P/civetweb/test/windows_fail_silent.cgi.cmd
similarity index 100%
rename from deprecated/3P/civetweb/test/windows_fail_silent.cgi.cmd
rename to src/3P/civetweb/test/windows_fail_silent.cgi.cmd
diff --git a/deprecated/3P/civetweb/test/x.php b/src/3P/civetweb/test/x.php
similarity index 100%
rename from deprecated/3P/civetweb/test/x.php
rename to src/3P/civetweb/test/x.php
diff --git a/deprecated/3P/civetweb/testutils/Browser/Browser.cpp b/src/3P/civetweb/testutils/Browser/Browser.cpp
similarity index 100%
rename from deprecated/3P/civetweb/testutils/Browser/Browser.cpp
rename to src/3P/civetweb/testutils/Browser/Browser.cpp
diff --git a/deprecated/3P/civetweb/testutils/Browser/Browser.vcxproj b/src/3P/civetweb/testutils/Browser/Browser.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/testutils/Browser/Browser.vcxproj
rename to src/3P/civetweb/testutils/Browser/Browser.vcxproj
diff --git a/deprecated/3P/civetweb/testutils/readme.txt b/src/3P/civetweb/testutils/readme.txt
similarity index 100%
rename from deprecated/3P/civetweb/testutils/readme.txt
rename to src/3P/civetweb/testutils/readme.txt
diff --git a/deprecated/3P/civetweb/testutils/testclient/testclient.c b/src/3P/civetweb/testutils/testclient/testclient.c
similarity index 100%
rename from deprecated/3P/civetweb/testutils/testclient/testclient.c
rename to src/3P/civetweb/testutils/testclient/testclient.c
diff --git a/deprecated/3P/civetweb/testutils/testclient/testclient.vcxproj b/src/3P/civetweb/testutils/testclient/testclient.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/testutils/testclient/testclient.vcxproj
rename to src/3P/civetweb/testutils/testclient/testclient.vcxproj
diff --git a/deprecated/3P/civetweb/testutils/testclient_chunked_linux/testclient.c b/src/3P/civetweb/testutils/testclient_chunked_linux/testclient.c
similarity index 100%
rename from deprecated/3P/civetweb/testutils/testclient_chunked_linux/testclient.c
rename to src/3P/civetweb/testutils/testclient_chunked_linux/testclient.c
diff --git a/deprecated/3P/civetweb/testutils/testclient_chunked_linux/testclient2.vcxproj b/src/3P/civetweb/testutils/testclient_chunked_linux/testclient2.vcxproj
similarity index 100%
rename from deprecated/3P/civetweb/testutils/testclient_chunked_linux/testclient2.vcxproj
rename to src/3P/civetweb/testutils/testclient_chunked_linux/testclient2.vcxproj