Adding Z plus jet control region to fake estimator; restructure code