Minor revision: move builder-related functionality to Builder modules