C++ folder structural refactoring