Restructure the control hierarchy.

Completed the database controls.