Rename folder and update reference
Make it all work