Cleaned up code

Renamed ItemInfo to ItemDisplayInfo.
Removed redundant ItemName, ItemIcon, ItemDescriptio, from Item/Slot
which ItemDisplayInfo contains.