add datastruct classes, remove ??? from cake init