Some changes to directory structure to allow for external CMake projects