Added option to remove generated config.h on clean
added two new layouts