Rename folders to match their namespace