reorganized concept mapper methods

event handlers are considered higher-level, so they come first