gloglotto: move some stuff around