Remove unnecessary rise-storage sub-folder