Move into boatd_client package