Make the ItemRepository use a mapper
Minor cleanup
Rename ItemRepository to GenericRepository
Cleanup - fix bug with importer