CXX-302 continued refactoring and support for basic builds