Directory restructure and cmake cleanup