Refactor project targets