Refactor package structure and connection form.