refactored project structure
refactored project structure