Like my primary storage, with the old storage in a sub folder.

There's still a WP51 folder in there somewhere...