Separate Build from Thor