genericize several watch files