WIP reorganize ci