Refactor project tree