Many Fixes

We've got psr-4 here and some docblock fixes. I've also improved the service provider.