Change to use subdirectory for build
Start of refactoring work