Organize providers in separate package.