Renaming wrong package
Flip the way ServiceLocator is created...