Refactor class to proper place

Tool automagic and not enough coffee.