Bug 1106629 - Update storage path

Yep, and I was thinking the same while I was working on this patch! I didn't want to change too much, but as you mention it, I'll come up with another version. :smile: