new makefile for reorg