Re-arrange the import order as per code review comments.