Cleaned up package names and moved the database query example into the
control package.