Separate tools and formatting

Separate tools into separate classes.  Formatted names and methods