Remove CupCake project, move its contents to other assemblies