Start refactoring cakefile