Re-organization of the Grizzly provider code.