New cmake layout and improvements