Some refactor for item classes moved to item package