Moved controller generator into new format. Unfinished.
Controller generator now adapted to new approach-- needs more tests written.