cut to dirs, rewrite Makefile
merge confix Makefile