Split out the models into separate classes.

Update project definition/namespace.