move some things around -- cmake style