Finished refactoring.
Now connect providers deliver modular - as classes.