Changed inventory to use new abstract classes and templates.
Removed no longer needed files