Code improvement: Move adapters into new package