Cleanup and Started structuring
Separated ViewModels