Improve the forth part
Rename folder