Models

There are a lot of models (interfaces, enum, etc) that are only used in a single file, these should be moved to that file instead of having a bunch of files that define a single interface.

assigned to @bclayton