More pragmatic placement of the Core and Constants classes.