refactor event system
Split maps apart