Changed a lot
Refactored project structure