Get the CLI working again. Reorganize packages.