Remove the migrated services, rename main package