Change up some locations and folder names