Project refactoring restructure.