Change the folder name, fixing bugs