Flatten the whole hierarchy.

That makes using Goclipse awkward, but the
import path is so much nicer.