Refactored project structure