Move around some import stuff.
Update documentation.