Added type watcher and moved watch functions under created type
Changed watcher package name to watch