moving to own omodule