Refactor inventory organisations