rename folders
fix the map (accidentally deleted a few files