code refinement in Watcher class
added data sources directories