Better makefile, moved stuff around