modify cmake configure and dir layout