Rename folders so they are listed in correct order