More Cake restructure; remove 2 netlogo dirs