Renaming, organising things for phenoplayer

these changes should enable phenoplayer to work
I matched the new JSON naming system in generator and player.