Refactor packaging of adapter classes.