refactored
refactored project structure