Rearranging the project structure
Fixed merge issues: