half way to tidy up to adopt new design
re-design builder/maker
tidy up and build
re-design builder_root