removed all but last two client classes, changed cakefiles to two space indents