diff --git a/src/Container/ConfigProvider.php b/src/ConfigProvider.php
similarity index 56%
rename from src/Container/ConfigProvider.php
rename to src/ConfigProvider.php
index 6751d2bbe..960aa7bb3 100644
--- a/src/Container/ConfigProvider.php
+++ b/src/ConfigProvider.php
@@ -2,10 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Container;
-
-use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\AdapterServiceFactory;
+namespace PhpDb;
 
 final class ConfigProvider
 {
@@ -20,8 +17,8 @@ public function getDependencies(): array
     {
         return [
             'factories' => [
-                AdapterInterface::class => AdapterServiceFactory::class,
-                AdapterManager::class   => AdapterManagerFactory::class,
+                Adapter\AdapterInterface::class => Container\AdapterServiceFactory::class,
+                Container\AdapterManager::class => Container\AdapterManagerFactory::class,
             ],
         ];
     }
diff --git a/src/Adapter/AdapterAbstractServiceFactory.php b/src/Container/AdapterAbstractServiceFactory.php
similarity index 63%
rename from src/Adapter/AdapterAbstractServiceFactory.php
rename to src/Container/AdapterAbstractServiceFactory.php
index f8229d1c4..19a8d5379 100644
--- a/src/Adapter/AdapterAbstractServiceFactory.php
+++ b/src/Container/AdapterAbstractServiceFactory.php
@@ -1,9 +1,13 @@
 <?php
 
-namespace PhpDb\Adapter;
+declare(strict_types=1);
+
+namespace PhpDb\Container;
 
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use PhpDb\Adapter\Adapter;
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\ResultSet\ResultSetInterface;
 use Psr\Container\ContainerInterface;
 
 use function is_array;
@@ -20,11 +24,8 @@ class AdapterAbstractServiceFactory implements AbstractFactoryInterface
 
     /**
      * Can we create an adapter by the requested name?
-     *
-     * @param  string $requestedName
-     * @return bool
      */
-    public function canCreate(ContainerInterface $container, $requestedName)
+    public function canCreate(ContainerInterface $container, string $requestedName): bool
     {
         $config = $this->getConfig($container);
         if (empty($config)) {
@@ -38,14 +39,20 @@ public function canCreate(ContainerInterface $container, $requestedName)
 
     /**
      * Create a DB adapter
-     *
-     * @param  string $requestedName
-     * @return Adapter
      */
-    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
+    public function __invoke(ContainerInterface $container, string $requestedName, ?array $options = null): AdapterInterface
     {
-        $config = $this->getConfig($container);
-        return new Adapter($config[$requestedName]);
+        $manager         = $container->get(AdapterManager::class);
+        $driverFactory   = ($manager->get(DriverInterfaceFactoryFactoryInterface::class))($container, $requestedName);
+        $driverInstance  = $driverFactory::createFromConfig($container, $requestedName);
+        $platformFactory = ($manager->get(PlatformInterfaceFactoryFactoryInterface::class))();
+
+        //$config = $this->getConfig($container);
+        return new Adapter(
+            $driverInstance,
+            $platformFactory::fromDriver($driverInstance),
+            $manager->get(ResultSetInterface::class),
+        );
     }
 
     /**
diff --git a/src/Adapter/AdapterServiceDelegator.php b/src/Container/AdapterServiceDelegator.php
similarity index 91%
rename from src/Adapter/AdapterServiceDelegator.php
rename to src/Container/AdapterServiceDelegator.php
index ffba58cc4..e521b5255 100644
--- a/src/Adapter/AdapterServiceDelegator.php
+++ b/src/Container/AdapterServiceDelegator.php
@@ -2,9 +2,12 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter;
+namespace PhpDb\Container;
 
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use PhpDb\Adapter\AdapterInterface;
+use PhpDb\Adapter\AdapterAwareInterface;
+use PhpDb\Exception;
 use Psr\Container\ContainerInterface;
 
 use function sprintf;
diff --git a/src/Adapter/AdapterServiceFactory.php b/src/Container/AdapterServiceFactory.php
similarity index 94%
rename from src/Adapter/AdapterServiceFactory.php
rename to src/Container/AdapterServiceFactory.php
index d11c9fd05..2e38763e6 100644
--- a/src/Adapter/AdapterServiceFactory.php
+++ b/src/Container/AdapterServiceFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter;
+namespace PhpDb\Container;
 
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Container\AdapterManager;
diff --git a/src/Container/ConnectionInterfaceFactoryFactoryInterface.php b/src/Container/ConnectionInterfaceFactoryFactoryInterface.php
new file mode 100644
index 000000000..aeedefa9f
--- /dev/null
+++ b/src/Container/ConnectionInterfaceFactoryFactoryInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Container;
+
+interface ConnectionInterfaceFactoryFactoryInterface extends FactoryFactoryInterface
+{
+}
diff --git a/src/Container/DriverInterfaceFactoryFactoryInterface.php b/src/Container/DriverInterfaceFactoryFactoryInterface.php
new file mode 100644
index 000000000..e4d1e8bdf
--- /dev/null
+++ b/src/Container/DriverInterfaceFactoryFactoryInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Container;
+
+interface DriverInterfaceFactoryFactoryInterface extends FactoryFactoryInterface
+{
+}
diff --git a/src/Container/FactoryFactoryInterface.php b/src/Container/FactoryFactoryInterface.php
new file mode 100644
index 000000000..44170271b
--- /dev/null
+++ b/src/Container/FactoryFactoryInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Container;
+
+use Psr\Container\ContainerInterface;
+
+interface FactoryFactoryInterface
+{
+    public function __invoke(): callable;
+}
diff --git a/src/Container/PlatformInterfaceFactoryFactoryInterface.php b/src/Container/PlatformInterfaceFactoryFactoryInterface.php
new file mode 100644
index 000000000..544648fa5
--- /dev/null
+++ b/src/Container/PlatformInterfaceFactoryFactoryInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Container;
+
+interface PlatformInterfaceFactoryFactoryInterface  extends FactoryFactoryInterface
+{
+}