Refactored project structure again