Reordered some targets in the Makefile