Tidy up
Create WatchEventHandler Interface
Start WatchEventHandler Tests