modify package structure and interface.