Refactored project structure
Refactored project structure