Project refactoring