move builder stuff from main repo (FIXME needs cleaning)