Reorganize (again)

Signed-off-by: Ronald G. Minnich <rminnich@google.com>