Format some files and rename tools
Tools are now a pub package.
Added JSON Output
Tools.