More Cake restructure; remove .sh files