Rename folders back to where they should be