Major project directory and structure refactor