Changed name of universe equality. Moved context splitting and type ordering into separate files.