structural changes, cmakelists