nat: refactor and split fo EI/ED features p.2