WIP: restructuring to one media type per import