Move package structures to have cleaner module names. Significant moves,
but no functional changes.