Makefile, build.cmd: now using standard layout from the Mercury project template