report: Structure re-organisation