Major refactor lib inclusion

Merging a major provider rehaul into master.