More Refactoring.
Starting to build the item component system.