Cleanup and re-organization of default contrib modules.