removed non-existant dirs from cmake resulting from reorg
modified header locations