Moved Item class into another file
Refactored and removed dead code