Start moving to compo for the model composition.

The specs will not work yet, as they need rewriting.  Some things may need
fixing, too.

There are some extraneous class files and other reorganising to be done.