Merge pull request #1 from HaToHo/master

Metadata generation
Removed files that should be dynamically created.
To make the data files be placed where they should be.
Allow specification of private or public key, either will work.
Editorial