Changing output structure and removing xml fields