move call steps to the right module