moved stuff around in makefile for great justice