restructure imports