renamed some files to avert confusion, also normalized pubspec.yaml files