Fix inventories and restructure