Re-order makefile so it makes more sense