refactored both omod and server projects