Cleaning up control file
Renaming artifacts
Add watch file
Remove watch file