committing structural fixes to imports