* Removed Pair and Trio (use Tuple instead).
* Made DefinitionFile a content type.
Cleaning up
cleaning up