Updated module imports from the Toolbox. Also upgraded the build_toolbox
utility to build a consolidated version.