Refactor project layout