Entity hierarchy

Started to create the Entity hierarchy.