Complete overhaul of imports

Explicit is better than implicit.