Re-structure packages, move utilities into a separate module.