Housekeeping: Move types from viewmodel to entities

[ThePhisch]

Moved types that were previously, and incorrectly, in the viewmodels folder, into the entities folder.