Changed toolbox nesting to be easier on the eyes.  Removed simple provider.

Signed-off-by: Richard Minerich <richard.minerich@gmail.com>