Internalise some classes.

No need to make these public at this early stage.