feat(app): Separate client and server watchers