Added better organisation of inventory storage