New structure and Item class and tests were improved