Rework Makefile and rename configs