project cleanup, added file system watcher