Rename folder
Improve parsed watch file