diff --git a/.gitignore b/.gitignore
index 2f8e904a..8854cc7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.cm*
 *.annot
 *.o
+.merlin
 /.depend
 /META
 /Makefile
diff --git a/src/.merlin b/src/.merlin
deleted file mode 100644
index 93ea271a..00000000
--- a/src/.merlin
+++ /dev/null
@@ -1,8 +0,0 @@
-EXCLUDE_QUERY_DIR
-B /Users/sacha/.opam/4.08.1/lib/stdlib-shims
-B ../_build/default/lib/.lib.objs/byte
-B ../_build/default/src/.ocamlgraph.objs/byte
-S /Users/sacha/.opam/4.08.1/lib/stdlib-shims
-S ../lib
-S .
-FLG -open Ocamlgraph -open Lib
diff --git a/src/dune b/src/dune
index ee8c1d92..870b9a01 100644
--- a/src/dune
+++ b/src/dune
@@ -1,6 +1,6 @@
 (library
-  (name graph)
-  (public_name ocamlgraph.graph)
+  (name graphlib)
+  (public_name ocamlgraph.graphlib)
   (libraries stdlib-shims lib)
   (flags -open Lib)
   (modules_without_implementation dot_ast sig sig_pack))
diff --git a/src/graphlib.ml b/src/graphlib.ml
new file mode 100644
index 00000000..6b9863ca
--- /dev/null
+++ b/src/graphlib.ml
@@ -0,0 +1,40 @@
+module Sig = Sig
+module Sig_pack = Sig_pack
+module Dot_ast = Dot_ast
+module Util = Util
+module Persistent = Persistent
+module Imperative = Imperative
+module Delaunay = Delaunay
+module Builder = Builder
+module Classic = Classic
+module Rand = Rand
+module Oper = Oper
+module Components = Components
+module Path = Path
+module Nonnegative = Nonnegative
+module Traverse = Traverse
+module Coloring = Coloring
+module Topological = Topological
+module Kruskal = Kruskal
+module Flow = Flow
+module Prim = Prim
+module Dominator = Dominator
+module Graphviz = Graphviz
+module Gml = Gml
+module Dot = Dot
+module Pack = Pack
+module Gmap = Gmap
+module Minsep = Minsep
+module Cliquetree = Cliquetree
+module Mcs_m = Mcs_m
+module Md = Md
+module Strat = Strat
+module Fixpoint = Fixpoint
+module Leaderlist = Leaderlist
+module Contraction = Contraction
+module Graphml = Graphml
+module Merge = Merge
+module Mincut = Mincut
+module Clique = Clique
+module WeakTopological = WeakTopological
+module ChaoticIteration = ChaoticIteration
\ No newline at end of file
diff --git a/src/imperative.ml b/src/imperative.ml
index e73e995f..0044da3f 100644
--- a/src/imperative.ml
+++ b/src/imperative.ml
@@ -233,7 +233,7 @@ module Graph = struct
   module Concrete(V: COMPARABLE) = struct
 
     module G = struct include Digraph.Concrete(V) type return = unit end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Redefine the [add_edge] and [remove_edge] operations *)
 
@@ -261,7 +261,7 @@ module Graph = struct
       include Digraph.ConcreteLabeled(V)(Edge)
       type return = unit
     end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Redefine the [add_edge] and [remove_edge] operations *)
 
@@ -289,7 +289,7 @@ module Graph = struct
   module Abstract(V: sig type t end) = struct
 
     module G = struct include Digraph.Abstract(V) type return = unit end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     module Mark = G.Mark
@@ -318,7 +318,7 @@ module Graph = struct
       include Digraph.AbstractLabeled(V)(Edge)
       type return = unit
     end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     module Mark = G.Mark
diff --git a/src/persistent.ml b/src/persistent.ml
index d5d6e51c..7b6425b3 100644
--- a/src/persistent.ml
+++ b/src/persistent.ml
@@ -209,7 +209,7 @@ module Graph = struct
   module Concrete(V: COMPARABLE) = struct
 
     module G = struct include Digraph.Concrete(V) type return = t end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     let empty = G.empty
@@ -238,7 +238,7 @@ module Graph = struct
       include Digraph.ConcreteLabeled(V)(Edge)
       type return = t
     end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     let empty = G.empty
@@ -267,7 +267,7 @@ module Graph = struct
   module Abstract(V: sig type t end) = struct
 
     module G = struct include Digraph.Abstract(V) type return = t end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     let empty = G.empty
@@ -296,7 +296,7 @@ module Graph = struct
       include Digraph.AbstractLabeled(V)(Edge)
       type return = t
     end
-    include Graph(G)
+    include Blocks.Graph(G)
 
     (* Export some definitions of [G] *)
     let empty = G.empty