Refactoring ProjectApplication