Update some more locations, rename folders for consistency