restructure
fix test
improved calculation of the left offset
Issue 1986
next step in event refactoring (wip)