Phase(C++): Project structure cleanup