renamed ServiceFinder to ServiceLocator and changed it to be a static class.