re-organized NE classes + cleanup evt generation