rename builder/common to common since it is generally useful