Probably better to leave this as it was. We'll be 2.x soonish anyway so extracting that will only meaning having to put it back later.