Project refactorized