Fix organizing imports involving import as statements

Fix organizing imports involving import as statements #549