Moved adapters in their module package