Renames files to remove redundancy
Updates the API.

  * tools: grid not working. needs to be about the grid, not
           fitting of charges.