Moved the core services into its own class.