Organized provider-specific partials; simplified partial names

Resolves #186