modified imports for new structure