Cleanup and re-organization of default contrib modules.

## Ready State: No