Make the restructure for imports safer.