Refactored converters
More refactoring on containers and items
Removed unnecessary method
Minor renames