Separate modules for some types.
Moved types to separate modules.
Experimented a bit with a universe description from the Ornaments paper.