Updating to 1.6.2; first step: organize imports