Move Mojew methods into own class