Rename Watch -> Watcher
Insert blank lines
Add runOnce command
Cleanup