Moving around basic model subelements

Reorganizing some of the model base packages. Renaming ModelItem to
ModelElement because Item is too overloaded in the inventory.