Cmake Updates

Merging latest code organization changes, plfs.h.in fixes, and more. Still need to fix the .spec file.