diff --git a/src/Edge/Base.php b/src/Edge.php
similarity index 96%
rename from src/Edge/Base.php
rename to src/Edge.php
index 9317566f..fe1452d9 100644
--- a/src/Edge/Base.php
+++ b/src/Edge.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Graphp\Graph\Edge;
+namespace Graphp\Graph;
 
 use Graphp\Graph\Attribute\AttributeAware;
 use Graphp\Graph\Attribute\AttributeBagReference;
@@ -8,12 +8,16 @@
 use Graphp\Graph\Exception\InvalidArgumentException;
 use Graphp\Graph\Exception\LogicException;
 use Graphp\Graph\Exception\RangeException;
-use Graphp\Graph\Graph;
 use Graphp\Graph\Set\Vertices;
 use Graphp\Graph\Set\VerticesAggregate;
-use Graphp\Graph\Vertex;
 
-abstract class Base implements VerticesAggregate, AttributeAware
+/**
+ * Abstract base for `EdgeUndirected` and `EdgeDirected` containing common interfaces and behavior for all edges.
+ *
+ * @see EdgeUndirected
+ * @see EdgeDirected
+ */
+abstract class Edge implements VerticesAggregate, AttributeAware
 {
     /**
      * weight of this edge
diff --git a/src/Edge/Directed.php b/src/EdgeDirected.php
similarity index 95%
rename from src/Edge/Directed.php
rename to src/EdgeDirected.php
index c5627be6..41afbaa8 100644
--- a/src/Edge/Directed.php
+++ b/src/EdgeDirected.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace Graphp\Graph\Edge;
+namespace Graphp\Graph;
 
 use Graphp\Graph\Exception\InvalidArgumentException;
-use Graphp\Graph\Graph;
 use Graphp\Graph\Set\Vertices;
-use Graphp\Graph\Vertex;
 
-class Directed extends Base
+class EdgeDirected extends Edge
 {
     /**
      * source/start vertex
diff --git a/src/Edge/Undirected.php b/src/EdgeUndirected.php
similarity index 95%
rename from src/Edge/Undirected.php
rename to src/EdgeUndirected.php
index 9541af1c..c63a5d01 100644
--- a/src/Edge/Undirected.php
+++ b/src/EdgeUndirected.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace Graphp\Graph\Edge;
+namespace Graphp\Graph;
 
 use Graphp\Graph\Exception\InvalidArgumentException;
-use Graphp\Graph\Graph;
-use Graphp\Graph\Vertex;
 use Graphp\Graph\Set\Vertices;
 
-class Undirected extends Base
+class EdgeUndirected extends Edge
 {
     /**
      * vertex a
diff --git a/src/Graph.php b/src/Graph.php
index 61de990b..a788486b 100644
--- a/src/Graph.php
+++ b/src/Graph.php
@@ -4,9 +4,6 @@
 
 use Graphp\Graph\Attribute\AttributeAware;
 use Graphp\Graph\Attribute\AttributeBagReference;
-use Graphp\Graph\Edge\Base as Edge;
-use Graphp\Graph\Edge\Directed as EdgeDirected;
-use Graphp\Graph\Edge\Undirected as EdgeUndirected;
 use Graphp\Graph\Exception\BadMethodCallException;
 use Graphp\Graph\Exception\InvalidArgumentException;
 use Graphp\Graph\Exception\OutOfBoundsException;
diff --git a/src/Set/Edges.php b/src/Set/Edges.php
index 8fdca809..39109d02 100644
--- a/src/Set/Edges.php
+++ b/src/Set/Edges.php
@@ -2,7 +2,7 @@
 
 namespace Graphp\Graph\Set;
 
-use Graphp\Graph\Edge\Base as Edge;
+use Graphp\Graph\Edge;
 use Graphp\Graph\Exception\InvalidArgumentException;
 use Graphp\Graph\Exception\OutOfBoundsException;
 use Graphp\Graph\Exception\UnderflowException;
diff --git a/src/Vertex.php b/src/Vertex.php
index 458f1878..d4b5ccb7 100644
--- a/src/Vertex.php
+++ b/src/Vertex.php
@@ -4,8 +4,6 @@
 
 use Graphp\Graph\Attribute\AttributeAware;
 use Graphp\Graph\Attribute\AttributeBagReference;
-use Graphp\Graph\Edge\Base as Edge;
-use Graphp\Graph\Edge\Directed as EdgeDirected;
 use Graphp\Graph\Exception\BadMethodCallException;
 use Graphp\Graph\Exception\InvalidArgumentException;
 use Graphp\Graph\Set\Edges;
diff --git a/src/Walk.php b/src/Walk.php
index 40b0d7f5..db7b644e 100644
--- a/src/Walk.php
+++ b/src/Walk.php
@@ -4,7 +4,6 @@
 
 use Graphp\Graph\Set\Edges;
 use Graphp\Graph\Set\Vertices;
-use Graphp\Graph\Edge\Base as Edge;
 use Graphp\Graph\Exception\UnderflowException;
 use Graphp\Graph\Exception\InvalidArgumentException;
 use Graphp\Graph\Set\DualAggregate;
diff --git a/tests/Edge/EdgeAttributesTest.php b/tests/EdgeAttributesTest.php
similarity index 94%
rename from tests/Edge/EdgeAttributesTest.php
rename to tests/EdgeAttributesTest.php
index e4a7ffcf..53d6ed7e 100644
--- a/tests/Edge/EdgeAttributesTest.php
+++ b/tests/EdgeAttributesTest.php
@@ -1,15 +1,13 @@
 <?php
 
-namespace Graphp\Graph\Tests\Edge;
+namespace Graphp\Graph\Tests;
 
 use Graphp\Graph\Graph;
-use Graphp\Graph\Edge\Base as Edge;
-use Graphp\Graph\Tests\TestCase;
+use Graphp\Graph\Edge;
 
 class EdgeAttributesTest extends TestCase
 {
     /**
-     *
      * @var Edge
      */
     private $edge;
diff --git a/tests/Edge/EdgeBaseTest.php b/tests/EdgeBaseTest.php
similarity index 97%
rename from tests/Edge/EdgeBaseTest.php
rename to tests/EdgeBaseTest.php
index dd1e227f..8736cf54 100644
--- a/tests/Edge/EdgeBaseTest.php
+++ b/tests/EdgeBaseTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Graphp\Graph\Tests\Edge;
+namespace Graphp\Graph\Tests;
 
 use Graphp\Graph\Graph;
-use Graphp\Graph\Edge\Base as Edge;
+use Graphp\Graph\Edge;
 use Graphp\Graph\Tests\Attribute\AbstractAttributeAwareTest;
 
 abstract class EdgeBaseTest extends AbstractAttributeAwareTest
@@ -13,7 +13,6 @@ abstract class EdgeBaseTest extends AbstractAttributeAwareTest
     protected $v2;
 
     /**
-     *
      * @var Edge
      */
     protected $edge;
diff --git a/tests/Edge/EdgeDirectedTest.php b/tests/EdgeDirectedTest.php
similarity index 94%
rename from tests/Edge/EdgeDirectedTest.php
rename to tests/EdgeDirectedTest.php
index 13e4662e..46595a97 100644
--- a/tests/Edge/EdgeDirectedTest.php
+++ b/tests/EdgeDirectedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Graphp\Graph\Tests\Edge;
+namespace Graphp\Graph\Tests;
 
 class EdgeDirectedTest extends EdgeBaseTest
 {
diff --git a/tests/Edge/EdgeUndirectedTest.php b/tests/EdgeUndirectedTest.php
similarity index 94%
rename from tests/Edge/EdgeUndirectedTest.php
rename to tests/EdgeUndirectedTest.php
index e0000a52..3526d33d 100644
--- a/tests/Edge/EdgeUndirectedTest.php
+++ b/tests/EdgeUndirectedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Graphp\Graph\Tests\Edge;
+namespace Graphp\Graph\Tests;
 
 class EdgeUndirectedTest extends EdgeBaseTest
 {
diff --git a/tests/Set/EdgesTest.php b/tests/Set/EdgesTest.php
index 055047c4..253b7ab1 100644
--- a/tests/Set/EdgesTest.php
+++ b/tests/Set/EdgesTest.php
@@ -2,7 +2,7 @@
 
 namespace Graphp\Graph\Tests\Set;
 
-use Graphp\Graph\Edge\Base as Edge;
+use Graphp\Graph\Edge;
 use Graphp\Graph\Graph;
 use Graphp\Graph\Set\Edges;
 use Graphp\Graph\Tests\TestCase;
@@ -156,7 +156,7 @@ public function testTwoRandom(Edges $edges)
     {
         $edgeRandom = $edges->getEdgeOrder(Edges::ORDER_RANDOM);
 
-        $this->assertInstanceOf('Graphp\Graph\Edge\Base', $edgeRandom);
+        $this->assertInstanceOf('Graphp\Graph\Edge', $edgeRandom);
         $edges->getEdgeIndex($edges->getIndexEdge($edgeRandom));
 
         $edgesRandom = $edges->getEdgesOrder(Edges::ORDER_RANDOM);
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 296c4a06..15e947bf 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace Graphp\Graph\Tests;
 
-use Graphp\Graph\Edge\Directed;
-use Graphp\Graph\Edge\Base as Edge;
+use Graphp\Graph\Edge;
+use Graphp\Graph\EdgeDirected;
 use Graphp\Graph\Graph;
 use Graphp\Graph\Vertex;
 use PHPUnit\Framework\TestCase as BaseTestCase;
@@ -81,7 +81,7 @@ private function getVertexDump(Vertex $vertex)
     private function getEdgeDump(Edge $edge)
     {
         $ret = get_class($edge) . ' ';
-        if ($edge instanceof Directed) {
+        if ($edge instanceof EdgeDirected) {
             $ret .= $edge->getVertexStart()->getId() . ' -> ' . $edge->getVertexEnd()->getId();
         } else {
             $vertices = $edge->getVertices()->getIds();