Changed root CMakeLists.txt to account for directory restructuring