Added changes in CMakeLists to have structure in order