Reorganized control registration

Separated controls from other classes so we no longer need a hard-coded
set of control names.