Adding install + cmake cleanup