Update to use new project structure.
Add a way to be able to add object types to models.