Added structure for the item class
probably fixed the merge error