Optimized imports

Optimized imports, using IDEA.

Everything seems to work fine for me after doing this, and this seems like a good start to 1.7 development.