Fix erroneous organize imports