Moved Item class to own file. Initial refactoring. All tests passed.