Moved view models into seperate folder and split each model out into its own class