The storage code is refactored into its own modules. Any objection to moving the net and criteria packages in opensaml-util into core and dropping the util? The criteria stuff at least is used in a lot of resolver stuff, and probably will be in the metadata, so it seems pretty core. The net stuff less so, but it's not much code. -- Scott