Created right project structure
- Folder structure refactoring