Refactor inventory code
Remove Intermediate directories from cache
Inventory updates