- Major project structure refactor