Reorganize the CMakefile.

Whoops ... looks like I forgot to check this in, previously. Oww.