Added folder support for file watching