Ev module refactoring

That should fix the issues we had mentioned earlier.