Fixed folder rename + create a new folder