Cakefile: redesign