Items drop and pickup correctly. Refactored some packages.