Refactoring Service Provider and Class loader