Major simplification

Wrapped both ItemStack and OreStack in a StackWrapper.