updated cmake for changes in dir structure