Begin item classification refactoring
Refactor item classification