Refactored fswatcher.