Staging Store Folder Restructure