Reverse new folder structure to old