Breaking up core service module to make it minify correct.