Ev module refactoring