Some reorganization and more work on the object model