Merge "Move Adapters to their own classes."