Move basic scala services into its own package and rename services