Items refactoring. One class for all items now