cleaned up Item hierarchy and added Consumable as a sub to MagicDevice