refactored the project structure
refacored new project structure