Revert "Move ServiceLocatorManager to externally visible package"

This reverts commit 39dce17953fc55308876505fae64879697a62a5a.