Watcher now handles layout files