Refactorizing adapters organization