diff --git a/README.md b/README.md
index 65ca7eb6..dedc2bac 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ git repository!
 Please also be sure to see the following files for more information
 
 * [client/README.md](client/README.md)
-* [c-host/README.md](c-host/README.md)
+* [host/README.md](host/README.md)
 * [module/README.md](module/README.md)
 
 ## Obtaining and using Looking Glass
diff --git a/VERSION b/VERSION
index 3f323bd2..950d8e41 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B2-rc1-10-g94d383a8c1+1
\ No newline at end of file
+B2-rc2-0-gd579705b10+1
\ No newline at end of file
diff --git a/c-host/.gitignore b/host/.gitignore
similarity index 100%
rename from c-host/.gitignore
rename to host/.gitignore
diff --git a/c-host/CMakeLists.txt b/host/CMakeLists.txt
similarity index 100%
rename from c-host/CMakeLists.txt
rename to host/CMakeLists.txt
diff --git a/c-host/README.md b/host/README.md
similarity index 100%
rename from c-host/README.md
rename to host/README.md
diff --git a/c-host/cmake/NVFBC.cmake b/host/cmake/NVFBC.cmake
similarity index 100%
rename from c-host/cmake/NVFBC.cmake
rename to host/cmake/NVFBC.cmake
diff --git a/c-host/cmake/PostCapture.cmake b/host/cmake/PostCapture.cmake
similarity index 100%
rename from c-host/cmake/PostCapture.cmake
rename to host/cmake/PostCapture.cmake
diff --git a/c-host/cmake/PreCapture.cmake b/host/cmake/PreCapture.cmake
similarity index 100%
rename from c-host/cmake/PreCapture.cmake
rename to host/cmake/PreCapture.cmake
diff --git a/c-host/include/interface/capture.h b/host/include/interface/capture.h
similarity index 100%
rename from c-host/include/interface/capture.h
rename to host/include/interface/capture.h
diff --git a/c-host/include/interface/platform.h b/host/include/interface/platform.h
similarity index 100%
rename from c-host/include/interface/platform.h
rename to host/include/interface/platform.h
diff --git a/c-host/platform/CMakeLists.txt b/host/platform/CMakeLists.txt
similarity index 100%
rename from c-host/platform/CMakeLists.txt
rename to host/platform/CMakeLists.txt
diff --git a/c-host/platform/Linux/CMakeLists.txt b/host/platform/Linux/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Linux/CMakeLists.txt
rename to host/platform/Linux/CMakeLists.txt
diff --git a/c-host/platform/Linux/capture/CMakeLists.txt b/host/platform/Linux/capture/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Linux/capture/CMakeLists.txt
rename to host/platform/Linux/capture/CMakeLists.txt
diff --git a/c-host/platform/Linux/capture/XCB/CMakeLists.txt b/host/platform/Linux/capture/XCB/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Linux/capture/XCB/CMakeLists.txt
rename to host/platform/Linux/capture/XCB/CMakeLists.txt
diff --git a/c-host/platform/Linux/capture/XCB/src/xcb.c b/host/platform/Linux/capture/XCB/src/xcb.c
similarity index 100%
rename from c-host/platform/Linux/capture/XCB/src/xcb.c
rename to host/platform/Linux/capture/XCB/src/xcb.c
diff --git a/c-host/platform/Linux/src/platform.c b/host/platform/Linux/src/platform.c
similarity index 100%
rename from c-host/platform/Linux/src/platform.c
rename to host/platform/Linux/src/platform.c
diff --git a/c-host/platform/Windows/CMakeLists.txt b/host/platform/Windows/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Windows/CMakeLists.txt
rename to host/platform/Windows/CMakeLists.txt
diff --git a/c-host/platform/Windows/app.manifest b/host/platform/Windows/app.manifest
similarity index 100%
rename from c-host/platform/Windows/app.manifest
rename to host/platform/Windows/app.manifest
diff --git a/c-host/platform/Windows/capture/CMakeLists.txt b/host/platform/Windows/capture/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Windows/capture/CMakeLists.txt
rename to host/platform/Windows/capture/CMakeLists.txt
diff --git a/c-host/platform/Windows/capture/DXGI/CMakeLists.txt b/host/platform/Windows/capture/DXGI/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Windows/capture/DXGI/CMakeLists.txt
rename to host/platform/Windows/capture/DXGI/CMakeLists.txt
diff --git a/c-host/platform/Windows/capture/DXGI/dll/libd3d11.def b/host/platform/Windows/capture/DXGI/dll/libd3d11.def
similarity index 100%
rename from c-host/platform/Windows/capture/DXGI/dll/libd3d11.def
rename to host/platform/Windows/capture/DXGI/dll/libd3d11.def
diff --git a/c-host/platform/Windows/capture/DXGI/src/dxgi.c b/host/platform/Windows/capture/DXGI/src/dxgi.c
similarity index 100%
rename from c-host/platform/Windows/capture/DXGI/src/dxgi.c
rename to host/platform/Windows/capture/DXGI/src/dxgi.c
diff --git a/c-host/platform/Windows/capture/DXGI/src/dxgi_extra.h b/host/platform/Windows/capture/DXGI/src/dxgi_extra.h
similarity index 100%
rename from c-host/platform/Windows/capture/DXGI/src/dxgi_extra.h
rename to host/platform/Windows/capture/DXGI/src/dxgi_extra.h
diff --git a/c-host/platform/Windows/capture/NVFBC/CMakeLists.txt b/host/platform/Windows/capture/NVFBC/CMakeLists.txt
similarity index 100%
rename from c-host/platform/Windows/capture/NVFBC/CMakeLists.txt
rename to host/platform/Windows/capture/NVFBC/CMakeLists.txt
diff --git a/c-host/platform/Windows/capture/NVFBC/src/nvfbc.c b/host/platform/Windows/capture/NVFBC/src/nvfbc.c
similarity index 100%
rename from c-host/platform/Windows/capture/NVFBC/src/nvfbc.c
rename to host/platform/Windows/capture/NVFBC/src/nvfbc.c
diff --git a/c-host/platform/Windows/capture/NVFBC/src/wrapper.cpp b/host/platform/Windows/capture/NVFBC/src/wrapper.cpp
similarity index 100%
rename from c-host/platform/Windows/capture/NVFBC/src/wrapper.cpp
rename to host/platform/Windows/capture/NVFBC/src/wrapper.cpp
diff --git a/c-host/platform/Windows/capture/NVFBC/src/wrapper.h b/host/platform/Windows/capture/NVFBC/src/wrapper.h
similarity index 100%
rename from c-host/platform/Windows/capture/NVFBC/src/wrapper.h
rename to host/platform/Windows/capture/NVFBC/src/wrapper.h
diff --git a/c-host/platform/Windows/include/windows/mousehook.h b/host/platform/Windows/include/windows/mousehook.h
similarity index 100%
rename from c-host/platform/Windows/include/windows/mousehook.h
rename to host/platform/Windows/include/windows/mousehook.h
diff --git a/c-host/platform/Windows/resource.rc b/host/platform/Windows/resource.rc
similarity index 100%
rename from c-host/platform/Windows/resource.rc
rename to host/platform/Windows/resource.rc
diff --git a/c-host/platform/Windows/src/mousehook.c b/host/platform/Windows/src/mousehook.c
similarity index 100%
rename from c-host/platform/Windows/src/mousehook.c
rename to host/platform/Windows/src/mousehook.c
diff --git a/c-host/platform/Windows/src/platform.c b/host/platform/Windows/src/platform.c
similarity index 100%
rename from c-host/platform/Windows/src/platform.c
rename to host/platform/Windows/src/platform.c
diff --git a/c-host/platform/Windows/src/platform.h b/host/platform/Windows/src/platform.h
similarity index 100%
rename from c-host/platform/Windows/src/platform.h
rename to host/platform/Windows/src/platform.h
diff --git a/c-host/src/app.c b/host/src/app.c
similarity index 100%
rename from c-host/src/app.c
rename to host/src/app.c
diff --git a/c-host/toolchain-mingw64.cmake b/host/toolchain-mingw64.cmake
similarity index 100%
rename from c-host/toolchain-mingw64.cmake
rename to host/toolchain-mingw64.cmake