Move adapters into their own package