Adding service providers for dev dependencies. Misc minor changes to base files