restructure import