Add hierarchy, update CMakeLists