diff --git a/composer.json b/composer.json
index 27b6c480..32480a37 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://github.com/clue/graph",
     "license": "MIT",
     "autoload": {
-        "psr-0": {"Fhaculty": "lib/"}
+        "psr-4": {"Fhaculty\\Graph\\": "src/"}
     },
     "require": {
         "php": ">=5.3.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f8d32b11..828ef003 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
     </testsuites>
     <filter>
         <whitelist>
-            <directory>./lib</directory>
+            <directory>./src/</directory>
         </whitelist>
     </filter>
 </phpunit>
\ No newline at end of file
diff --git a/lib/Fhaculty/Graph/Attribute/AttributeAware.php b/src/Attribute/AttributeAware.php
similarity index 100%
rename from lib/Fhaculty/Graph/Attribute/AttributeAware.php
rename to src/Attribute/AttributeAware.php
diff --git a/lib/Fhaculty/Graph/Attribute/AttributeBag.php b/src/Attribute/AttributeBag.php
similarity index 100%
rename from lib/Fhaculty/Graph/Attribute/AttributeBag.php
rename to src/Attribute/AttributeBag.php
diff --git a/lib/Fhaculty/Graph/Attribute/AttributeBagContainer.php b/src/Attribute/AttributeBagContainer.php
similarity index 100%
rename from lib/Fhaculty/Graph/Attribute/AttributeBagContainer.php
rename to src/Attribute/AttributeBagContainer.php
diff --git a/lib/Fhaculty/Graph/Attribute/AttributeBagNamespaced.php b/src/Attribute/AttributeBagNamespaced.php
similarity index 100%
rename from lib/Fhaculty/Graph/Attribute/AttributeBagNamespaced.php
rename to src/Attribute/AttributeBagNamespaced.php
diff --git a/lib/Fhaculty/Graph/Attribute/AttributeBagReference.php b/src/Attribute/AttributeBagReference.php
similarity index 100%
rename from lib/Fhaculty/Graph/Attribute/AttributeBagReference.php
rename to src/Attribute/AttributeBagReference.php
diff --git a/lib/Fhaculty/Graph/Edge/Base.php b/src/Edge/Base.php
similarity index 100%
rename from lib/Fhaculty/Graph/Edge/Base.php
rename to src/Edge/Base.php
diff --git a/lib/Fhaculty/Graph/Edge/Directed.php b/src/Edge/Directed.php
similarity index 100%
rename from lib/Fhaculty/Graph/Edge/Directed.php
rename to src/Edge/Directed.php
diff --git a/lib/Fhaculty/Graph/Edge/Undirected.php b/src/Edge/Undirected.php
similarity index 100%
rename from lib/Fhaculty/Graph/Edge/Undirected.php
rename to src/Edge/Undirected.php
diff --git a/lib/Fhaculty/Graph/Exception.php b/src/Exception.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception.php
rename to src/Exception.php
diff --git a/lib/Fhaculty/Graph/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/BadMethodCallException.php
rename to src/Exception/BadMethodCallException.php
diff --git a/lib/Fhaculty/Graph/Exception/DomainException.php b/src/Exception/DomainException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/DomainException.php
rename to src/Exception/DomainException.php
diff --git a/lib/Fhaculty/Graph/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/InvalidArgumentException.php
rename to src/Exception/InvalidArgumentException.php
diff --git a/lib/Fhaculty/Graph/Exception/LogicException.php b/src/Exception/LogicException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/LogicException.php
rename to src/Exception/LogicException.php
diff --git a/lib/Fhaculty/Graph/Exception/NegativeCycleException.php b/src/Exception/NegativeCycleException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/NegativeCycleException.php
rename to src/Exception/NegativeCycleException.php
diff --git a/lib/Fhaculty/Graph/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/OutOfBoundsException.php
rename to src/Exception/OutOfBoundsException.php
diff --git a/lib/Fhaculty/Graph/Exception/OverflowException.php b/src/Exception/OverflowException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/OverflowException.php
rename to src/Exception/OverflowException.php
diff --git a/lib/Fhaculty/Graph/Exception/RangeException.php b/src/Exception/RangeException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/RangeException.php
rename to src/Exception/RangeException.php
diff --git a/lib/Fhaculty/Graph/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/RuntimeException.php
rename to src/Exception/RuntimeException.php
diff --git a/lib/Fhaculty/Graph/Exception/UnderflowException.php b/src/Exception/UnderflowException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/UnderflowException.php
rename to src/Exception/UnderflowException.php
diff --git a/lib/Fhaculty/Graph/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exception/UnexpectedValueException.php
rename to src/Exception/UnexpectedValueException.php
diff --git a/lib/Fhaculty/Graph/Exporter/ExporterInterface.php b/src/Exporter/ExporterInterface.php
similarity index 100%
rename from lib/Fhaculty/Graph/Exporter/ExporterInterface.php
rename to src/Exporter/ExporterInterface.php
diff --git a/lib/Fhaculty/Graph/Graph.php b/src/Graph.php
similarity index 100%
rename from lib/Fhaculty/Graph/Graph.php
rename to src/Graph.php
diff --git a/lib/Fhaculty/Graph/Set/DualAggregate.php b/src/Set/DualAggregate.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/DualAggregate.php
rename to src/Set/DualAggregate.php
diff --git a/lib/Fhaculty/Graph/Set/Edges.php b/src/Set/Edges.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/Edges.php
rename to src/Set/Edges.php
diff --git a/lib/Fhaculty/Graph/Set/EdgesAggregate.php b/src/Set/EdgesAggregate.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/EdgesAggregate.php
rename to src/Set/EdgesAggregate.php
diff --git a/lib/Fhaculty/Graph/Set/Vertices.php b/src/Set/Vertices.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/Vertices.php
rename to src/Set/Vertices.php
diff --git a/lib/Fhaculty/Graph/Set/VerticesAggregate.php b/src/Set/VerticesAggregate.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/VerticesAggregate.php
rename to src/Set/VerticesAggregate.php
diff --git a/lib/Fhaculty/Graph/Set/VerticesMap.php b/src/Set/VerticesMap.php
similarity index 100%
rename from lib/Fhaculty/Graph/Set/VerticesMap.php
rename to src/Set/VerticesMap.php
diff --git a/lib/Fhaculty/Graph/Vertex.php b/src/Vertex.php
similarity index 100%
rename from lib/Fhaculty/Graph/Vertex.php
rename to src/Vertex.php
diff --git a/lib/Fhaculty/Graph/Walk.php b/src/Walk.php
similarity index 100%
rename from lib/Fhaculty/Graph/Walk.php
rename to src/Walk.php
diff --git a/tests/Fhaculty/Graph/Attribute/AttributeBagContainerTest.php b/tests/Attribute/AttributeBagContainerTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Attribute/AttributeBagContainerTest.php
rename to tests/Attribute/AttributeBagContainerTest.php
diff --git a/tests/Fhaculty/Graph/Attribute/AttributeBagNamespacedTest.php b/tests/Attribute/AttributeBagNamespacedTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Attribute/AttributeBagNamespacedTest.php
rename to tests/Attribute/AttributeBagNamespacedTest.php
diff --git a/tests/Fhaculty/Graph/Attribute/AttributeBagReferenceTest.php b/tests/Attribute/AttributeBagReferenceTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Attribute/AttributeBagReferenceTest.php
rename to tests/Attribute/AttributeBagReferenceTest.php
diff --git a/tests/Fhaculty/Graph/Edge/EdgeAttributesTest.php b/tests/Edge/EdgeAttributesTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Edge/EdgeAttributesTest.php
rename to tests/Edge/EdgeAttributesTest.php
diff --git a/tests/Fhaculty/Graph/Edge/EdgeBaseTest.php b/tests/Edge/EdgeBaseTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Edge/EdgeBaseTest.php
rename to tests/Edge/EdgeBaseTest.php
diff --git a/tests/Fhaculty/Graph/Edge/EdgeDirectedTest.php b/tests/Edge/EdgeDirectedTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Edge/EdgeDirectedTest.php
rename to tests/Edge/EdgeDirectedTest.php
diff --git a/tests/Fhaculty/Graph/Edge/EdgeUndirectedTest.php b/tests/Edge/EdgeUndirectedTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Edge/EdgeUndirectedTest.php
rename to tests/Edge/EdgeUndirectedTest.php
diff --git a/tests/Fhaculty/Graph/Exception/NegativeCycleExceptionTest.php b/tests/Exception/NegativeCycleExceptionTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Exception/NegativeCycleExceptionTest.php
rename to tests/Exception/NegativeCycleExceptionTest.php
diff --git a/tests/Fhaculty/Graph/GraphTest.php b/tests/GraphTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/GraphTest.php
rename to tests/GraphTest.php
diff --git a/tests/Fhaculty/Graph/Set/BaseVerticesTest.php b/tests/Set/BaseVerticesTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Set/BaseVerticesTest.php
rename to tests/Set/BaseVerticesTest.php
diff --git a/tests/Fhaculty/Graph/Set/EdgesTest.php b/tests/Set/EdgesTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Set/EdgesTest.php
rename to tests/Set/EdgesTest.php
diff --git a/tests/Fhaculty/Graph/Set/VerticesMapTest.php b/tests/Set/VerticesMapTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Set/VerticesMapTest.php
rename to tests/Set/VerticesMapTest.php
diff --git a/tests/Fhaculty/Graph/Set/VerticesTest.php b/tests/Set/VerticesTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/Set/VerticesTest.php
rename to tests/Set/VerticesTest.php
diff --git a/tests/Fhaculty/Graph/VertexTest.php b/tests/VertexTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/VertexTest.php
rename to tests/VertexTest.php
diff --git a/tests/Fhaculty/Graph/WalkTest.php b/tests/WalkTest.php
similarity index 100%
rename from tests/Fhaculty/Graph/WalkTest.php
rename to tests/WalkTest.php