Split out build to separate class