Fixed missing package exports

also other general CMakeLists.txt cleanup