Moved moduel loader to own class