Update Makefile to be more concise & to use properly names shell scripts