diff --git a/.gitignore b/.gitignore
index b2439f94..bcedbc3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+build
 ide/vs20??/*.db
 ide/vs20??/*.opendb
 ide/vs20??/*.user
@@ -8,3 +9,5 @@ docs/
 *.zip
 *.tar
 *.gz
+.vscode
+.DS_STore
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9ada3ed..8eb15a39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,10 @@ option(MI_INSTALL_TOPLEVEL  "Install directly into $CMAKE_INSTALL_PREFIX instead
 option(MI_NO_THP            "Disable transparent huge pages support on Linux/Android for the mimalloc process only" OFF)
 option(MI_EXTRA_CPPDEFS     "Extra pre-processor definitions (use as `-DMI_EXTRA_CPPDEFS=\"opt1=val1;opt2=val2\"`)" "")
 
+# negated options for vcpkg features
+option(MI_NO_USE_CXX        "Use plain C compilation (has priority over MI_USE_CXX)" OFF)
+option(MI_NO_OPT_ARCH       "Do not use architecture specific optimizations (like '-march=armv8.1-a' for example) (has priority over MI_OPT_ARCH)" OFF)
+
 # deprecated options
 option(MI_WIN_USE_FLS       "Use Fiber local storage on Windows to detect thread termination (deprecated)" OFF)
 option(MI_CHECK_FULL        "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
@@ -121,6 +125,15 @@ if(CMAKE_C_COMPILER_ID MATCHES "Intel")
     list(APPEND mi_cflags -Wall)
 endif()
 
+# negative overrides (mainly to support vcpkg features)
+if(MI_NO_USE_CXX) 
+  set(MI_USE_CXX "OFF")
+endif()
+if(MI_NO_OPT_ARCH)
+  set(MI_OPT_ARCH "OFF")
+endif()
+
+
 if(CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel")
   set(MI_USE_CXX "ON")
 endif()
diff --git a/docker/alpine-arm32v7/Dockerfile b/contrib/docker/alpine-arm32v7/Dockerfile
similarity index 100%
rename from docker/alpine-arm32v7/Dockerfile
rename to contrib/docker/alpine-arm32v7/Dockerfile
diff --git a/docker/alpine/Dockerfile b/contrib/docker/alpine/Dockerfile
similarity index 100%
rename from docker/alpine/Dockerfile
rename to contrib/docker/alpine/Dockerfile
diff --git a/docker/manylinux-x64/Dockerfile b/contrib/docker/manylinux-x64/Dockerfile
similarity index 100%
rename from docker/manylinux-x64/Dockerfile
rename to contrib/docker/manylinux-x64/Dockerfile
diff --git a/docker/readme.md b/contrib/docker/readme.md
similarity index 100%
rename from docker/readme.md
rename to contrib/docker/readme.md