Restructure classes

Refactoring, RefactoringView -> Watcher