Moved Watch to library