Rearraging watcher files