combine data structs
CMakeLists.txt fix and ini file included