Move WatchNode and WatchImageNode to CoreNodesUI