reorganize away from CI