reorganized packages, made first actionRequestGoal pass