moving from cmake
change structure