#1: Code refactored, Entity new higher level class, EntityItem added,
HandlerEntity added.