New file: builder-wrapper.h and builder-wrapper.c