reorganize clones, build process