i{builder,maker} packaging

thanks to @cdent, stylistic adjustments by @FND