Cleanup: move EINT routines to separate files; functions to handle display