Moved builder to its own submodule