Moved inventory to it's own namespace to prepare for union