Project refactorings