Code cleanup.
Re-order classes.