OFFileURLHandler: Move things around a little