diff --git a/src/Test/Ability/Drain.php b/src/Test/Ability/Drain.php
deleted file mode 100644
index 4802595..0000000
--- a/src/Test/Ability/Drain.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Ability;
-
-class Drain extends \OpenLegends\Engine\Abstract\Ability
-{}
\ No newline at end of file
diff --git a/src/Test/Ability/Guard.php b/src/Test/Ability/Guard.php
deleted file mode 100644
index ed32f8c..0000000
--- a/src/Test/Ability/Guard.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Ability;
-
-class Guard extends \OpenLegends\Engine\Abstract\Ability
-{}
\ No newline at end of file
diff --git a/src/Test/Ability/Lethal.php b/src/Test/Ability/Lethal.php
deleted file mode 100644
index b13fcdd..0000000
--- a/src/Test/Ability/Lethal.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Ability;
-
-class Lethal extends \OpenLegends\Engine\Abstract\Ability
-{}
\ No newline at end of file
diff --git a/src/Test/Ability/Multiple.php b/src/Test/Ability/Multiple.php
deleted file mode 100644
index 28de17c..0000000
--- a/src/Test/Ability/Multiple.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Ability;
-
-class Multiple extends \OpenLegends\Engine\Abstract\Ability
-{
-    private array $_abilities = [];
-
-    public function add(
-        \OpenLegends\Engine\Abstract\Ability $ability
-    ): void
-    {
-        $this->_abilities[] = $ability;
-    }
-}
\ No newline at end of file
diff --git a/src/Test/Attribute/Goblin.php b/src/Test/Attribute/Goblin.php
deleted file mode 100644
index 64c7e30..0000000
--- a/src/Test/Attribute/Goblin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Attribute;
-
-class Goblin extends \OpenLegends\Engine\Abstract\Attribute
-{}
\ No newline at end of file
diff --git a/src/Test/Attribute/Multiple.php b/src/Test/Attribute/Multiple.php
deleted file mode 100644
index bf3a20c..0000000
--- a/src/Test/Attribute/Multiple.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Attribute;
-
-class Multiple extends \OpenLegends\Engine\Abstract\Attribute
-{}
\ No newline at end of file
diff --git a/src/Test/Attribute/Neutral.php b/src/Test/Attribute/Neutral.php
deleted file mode 100644
index efa24a3..0000000
--- a/src/Test/Attribute/Neutral.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Attribute;
-
-class Neutral extends \OpenLegends\Engine\Abstract\Attribute
-{}
\ No newline at end of file
diff --git a/src/Test/Card/Ability/Drain.php b/src/Test/Card/Ability/Drain.php
new file mode 100644
index 0000000..88ff1b7
--- /dev/null
+++ b/src/Test/Card/Ability/Drain.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Ability;
+
+class Drain extends \OpenLegends\Engine\Abstract\Card\Ability
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Ability/Guard.php b/src/Test/Card/Ability/Guard.php
new file mode 100644
index 0000000..eb10f90
--- /dev/null
+++ b/src/Test/Card/Ability/Guard.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Ability;
+
+class Guard extends \OpenLegends\Engine\Abstract\Card\Ability
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Ability/Lethal.php b/src/Test/Card/Ability/Lethal.php
new file mode 100644
index 0000000..89abffd
--- /dev/null
+++ b/src/Test/Card/Ability/Lethal.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Ability;
+
+class Lethal extends \OpenLegends\Engine\Abstract\Card\Ability
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Ability/Multiple.php b/src/Test/Card/Ability/Multiple.php
new file mode 100644
index 0000000..1a6174e
--- /dev/null
+++ b/src/Test/Card/Ability/Multiple.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Ability;
+
+class Multiple extends \OpenLegends\Engine\Abstract\Card\Ability
+{
+    private array $_abilities = [];
+
+    public function add(
+        \OpenLegends\Engine\Abstract\Card\Ability $ability
+    ): void
+    {
+        $this->_abilities[] = $ability;
+    }
+}
\ No newline at end of file
diff --git a/src/Test/Card/Attribute/Goblin.php b/src/Test/Card/Attribute/Goblin.php
new file mode 100644
index 0000000..1294330
--- /dev/null
+++ b/src/Test/Card/Attribute/Goblin.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Attribute;
+
+class Goblin extends \OpenLegends\Engine\Abstract\Card\Attribute
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Attribute/Multiple.php b/src/Test/Card/Attribute/Multiple.php
new file mode 100644
index 0000000..ae3ced9
--- /dev/null
+++ b/src/Test/Card/Attribute/Multiple.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Attribute;
+
+class Multiple extends \OpenLegends\Engine\Abstract\Card\Attribute
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Attribute/Neutral.php b/src/Test/Card/Attribute/Neutral.php
new file mode 100644
index 0000000..740c678
--- /dev/null
+++ b/src/Test/Card/Attribute/Neutral.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Attribute;
+
+class Neutral extends \OpenLegends\Engine\Abstract\Card\Attribute
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Goblin.php b/src/Test/Card/Goblin.php
index 08145ec..85cea32 100644
--- a/src/Test/Card/Goblin.php
+++ b/src/Test/Card/Goblin.php
@@ -8,14 +8,14 @@ class Goblin extends \OpenLegends\Engine\Abstract\Card
 {
     public function __construct()
     {
-        $ability = new \OpenLegends\Asset\Test\Ability\Multiple();
+        $ability = new \OpenLegends\Asset\Test\Card\Ability\Multiple();
 
         $ability->add(
-            new \OpenLegends\Asset\Test\Ability\Lethal()
+            new \OpenLegends\Asset\Test\Card\Ability\Lethal()
         );
 
         $ability->add(
-            new \OpenLegends\Asset\Test\Ability\Guard()
+            new \OpenLegends\Asset\Test\Card\Ability\Guard()
         );
 
         $this->setAbility(
@@ -23,15 +23,15 @@ class Goblin extends \OpenLegends\Engine\Abstract\Card
         );
 
         $this->setAttribute(
-            new \OpenLegends\Asset\Test\Attribute\Neutral()
+            new \OpenLegends\Asset\Test\Card\Attribute\Neutral()
         );
 
         $this->setType(
-            new \OpenLegends\Asset\Test\Type\Goblin()
+            new \OpenLegends\Asset\Test\Card\Type\Goblin()
         );
 
         $this->setRarity(
-            new \OpenLegends\Asset\Test\Rarity\Common()
+            new \OpenLegends\Asset\Test\Card\Rarity\Common()
         );
 
         $this->setTitle(
diff --git a/src/Test/Card/Mouse.php b/src/Test/Card/Mouse.php
index 37889ca..7904092 100644
--- a/src/Test/Card/Mouse.php
+++ b/src/Test/Card/Mouse.php
@@ -9,15 +9,15 @@ class Mouse extends \OpenLegends\Engine\Abstract\Card
     public function __construct()
     {
         $this->setAttribute(
-            new \OpenLegends\Asset\Test\Attribute\Neutral()
+            new \OpenLegends\Asset\Test\Card\Attribute\Neutral()
         );
 
         $this->setType(
-            new \OpenLegends\Asset\Test\Type\Animal()
+            new \OpenLegends\Asset\Test\Card\Type\Animal()
         );
 
         $this->setRarity(
-            new \OpenLegends\Asset\Test\Rarity\Common()
+            new \OpenLegends\Asset\Test\Card\Rarity\Common()
         );
 
         $this->setTitle(
diff --git a/src/Test/Card/Rarity/Common.php b/src/Test/Card/Rarity/Common.php
new file mode 100644
index 0000000..99da7f5
--- /dev/null
+++ b/src/Test/Card/Rarity/Common.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Rarity;
+
+class Common extends \OpenLegends\Engine\Abstract\Card\Rarity
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Rarity/Rare.php b/src/Test/Card/Rarity/Rare.php
new file mode 100644
index 0000000..282e823
--- /dev/null
+++ b/src/Test/Card/Rarity/Rare.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Rarity;
+
+class Rare extends \OpenLegends\Engine\Abstract\Card\Rarity
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Rat.php b/src/Test/Card/Rat.php
index 43763f9..eb87ff1 100644
--- a/src/Test/Card/Rat.php
+++ b/src/Test/Card/Rat.php
@@ -9,15 +9,15 @@ class Rat extends \OpenLegends\Engine\Abstract\Card
     public function __construct()
     {
         $this->setAttribute(
-            new \OpenLegends\Asset\Test\Attribute\Neutral()
+            new \OpenLegends\Asset\Test\Card\Attribute\Neutral()
         );
 
         $this->setType(
-            new \OpenLegends\Asset\Test\Type\Animal()
+            new \OpenLegends\Asset\Test\Card\Type\Animal()
         );
 
         $this->setRarity(
-            new \OpenLegends\Asset\Test\Rarity\Common()
+            new \OpenLegends\Asset\Test\Card\Rarity\Common()
         );
 
         $this->setTitle(
diff --git a/src/Test/Card/Type/Animal.php b/src/Test/Card/Type/Animal.php
new file mode 100644
index 0000000..4248d17
--- /dev/null
+++ b/src/Test/Card/Type/Animal.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Type;
+
+class Animal extends \OpenLegends\Engine\Abstract\Card\Type
+{}
\ No newline at end of file
diff --git a/src/Test/Card/Type/Goblin.php b/src/Test/Card/Type/Goblin.php
new file mode 100644
index 0000000..607a0cc
--- /dev/null
+++ b/src/Test/Card/Type/Goblin.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenLegends\Asset\Test\Card\Type;
+
+class Goblin extends \OpenLegends\Engine\Abstract\Card\Type
+{}
\ No newline at end of file
diff --git a/src/Test/Game/Pool.php b/src/Test/Game/Pool.php
index 6552978..35b00ae 100644
--- a/src/Test/Game/Pool.php
+++ b/src/Test/Game/Pool.php
@@ -4,5 +4,5 @@ declare(strict_types=1);
 
 namespace OpenLegends\Asset\Test\Game;
 
-class Pool extends \OpenLegends\Engine\Abstract\Pool
+class Pool extends \OpenLegends\Engine\Abstract\Card\Pool
 {}
\ No newline at end of file
diff --git a/src/Test/Rarity/Common.php b/src/Test/Rarity/Common.php
deleted file mode 100644
index a7586d8..0000000
--- a/src/Test/Rarity/Common.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Rarity;
-
-class Common extends \OpenLegends\Engine\Abstract\Rarity
-{}
\ No newline at end of file
diff --git a/src/Test/Rarity/Rare.php b/src/Test/Rarity/Rare.php
deleted file mode 100644
index c1d41f1..0000000
--- a/src/Test/Rarity/Rare.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Rarity;
-
-class Rare extends \OpenLegends\Engine\Abstract\Rarity
-{}
\ No newline at end of file
diff --git a/src/Test/Type/Animal.php b/src/Test/Type/Animal.php
deleted file mode 100644
index 2e8b90b..0000000
--- a/src/Test/Type/Animal.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Type;
-
-class Animal extends \OpenLegends\Engine\Abstract\Type
-{}
\ No newline at end of file
diff --git a/src/Test/Type/Goblin.php b/src/Test/Type/Goblin.php
deleted file mode 100644
index 20d2efe..0000000
--- a/src/Test/Type/Goblin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace OpenLegends\Asset\Test\Type;
-
-class Goblin extends \OpenLegends\Engine\Abstract\Type
-{}
\ No newline at end of file