reorganize adapters