Moving overlap logic to OverlapProcessor + replaced old GoalProcessor by GoalProcessor2