added new File Watcher, and changed structure