Restructure analysis output - preparation to replay including