reorg Makefile.goose, make more dirs