move event classes into correct package