Rename folder sample & a fix