restructure external builders