more refactoring, notes adding, moving files around to be EH/EP specific