improve file generator.
Rename