watchapp: Move watchapp into its own dir