Refactored scripts, providers apart

Providers are opt-out, just include the main lib for performance
Setting to bypass link expander