Fixed internal structure to be used in std containers
Updated CMakeLists.txt