Rewrote Item code, Reorganized source