Move stuff according to new cake3 structure