Created enums, moved existing to /Source/models/Constants, updated references