Tidying of packages

Moved serializers around to keep top level package classes to a minimum
of the important classes.