added logic for shop/items, updated hierarchy in world