new Makefile based on re-org of folders