Move to one level of directory.

It's too messy otherwise

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