One of the main points of this commit was to rename packages in import statements, so that they match the real location of corresponding classes. Actually, I don't understand how it worked with wrong package names