Adapt Makefile for simpler workflow.
Update to simpler workflow
Merge branch 'source' into workflow_simplification_source