added headers with composition and derivation hierarchy
updated CMakeLists.txt and addeed find script