Renamed everything to the new namespace.  Updated layouts and diff capabilities.