change imports for new structure