template files rebased
Generators: fileds added
Format of comments changed, templates for config files added