Adapters moved to its own package