Adjust package structure of various Call.