Removed Unused directives
Moved ViewModels to separate namespace