General reorganization and cleanup

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>