Cleanup. Reordering classes.