rename folders to fix ordering