Moved Watching class out of console application