Moved Item classes to lib