Project refactoring for clarity