More reorganization

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>