Move stuff around.

Project should be go gettable, *and* work
good in Eclipse.