Added File watcher namespaces
Cleanup file -watcher changes for Specs
added specs for namespaced file-watching