Restructure goal report data organization