Change the output structure
Merge pull request #2574 from ogail/restructure

Change the output structure