Added items, item types, etc. Organized into packages better.