Revert "Inventory system, more modular approach"

This reverts commit 637b16264700aaa0843673555ca1ccaf9a9d467e.