restructuring, events now handled by events themselves
renaming of packages