tweaked naming structure. began working on tools and tests.

Signed-off-by: Tom Green <kingofcuddles@gmail.com>