Project refactored