I have moved this out into it's own file in my current branch.  Perhaps you should consider moving yours out as well?