move namespace a bit around