use new Makefile structure

Andre Maroneze requested to merge feature/andre/choc-simplification-analysis-scripts into master Jul 03, 2020