created watcher package and moved all files under that package