Refactor of item structure complete