Fixed some circle dependencies among new planner modules and OAC,PAI