Refactor adapters
Refactor xml files