Dependacy chain is broken

* Move the require statements into provider so they're not load order dependant