Changed package structure, moved all core services into core package.