Move all archive URI handling to a single file