Restructuring GoalConfiguration