Slight cleanup of file locations in flutter_tools
to make it easier to see which files are responsible
for data reporting.