refactored keygenerators
worked some edge cases, merging of yaml file and existing yaml files working again