BK-825 Import functionality must be aware of new TOC structure

Now that we have a new TOC structure, import and export code needed to be updated in order to work good with that new structure. That's about it!