diff --git a/_oasis b/_oasis
index a46b022a..3c1b73f8 100644
--- a/_oasis
+++ b/_oasis
@@ -48,7 +48,7 @@ Library "containers"
                     CCHeap, CCList, CCOpt, CCPair, CCFun, CCHash,
                     CCKList, CCInt, CCBool, CCArray, CCOrd, CCIO,
                     CCRandom, CCKTree, CCTrie, CCString, CCHashtbl,
-                    CCFlatHashtbl
+                    CCFlatHashtbl, CCSexp
   FindlibName:      containers
 
 Library "containers_string"
@@ -79,7 +79,7 @@ Library "containers_misc"
   Modules:          Cache, FHashtbl, FlatHashtbl, Hashset,
                     Heap, LazyGraph, PersistentGraph,
                     PHashtbl, SkipList, SplayTree, SplayMap, Univ,
-                    Bij, PiCalculus, Bencode, Sexp, RAL,
+                    Bij, PiCalculus, Bencode, RAL,
                     UnionFind, SmallSet, AbsSet, CSM,
                     ActionMan, BencodeOnDisk, TTree, PrintBox,
                     HGraph, Automaton, Conv, Bidir, Iteratee, BTree,
@@ -227,12 +227,12 @@ Executable lambda
   BuildDepends: containers,containers.misc
 
 Executable id_sexp
-  Path:     examples/
-  Install:  false
-  CompiledObject: native
-  MainIs:   id_sexp.ml
-  Build$:   flag(misc)
-  BuildDepends: containers,containers.misc
+  Path:             examples/
+  Install:          false
+  CompiledObject:   native
+  MainIs:           id_sexp.ml
+  Build$:           flag(misc)
+  BuildDepends:     containers
 
 SourceRepository head
   Type: git
diff --git a/misc/sexp.ml b/core/CCSexp.ml
similarity index 100%
rename from misc/sexp.ml
rename to core/CCSexp.ml
diff --git a/misc/sexp.mli b/core/CCSexp.mli
similarity index 100%
rename from misc/sexp.mli
rename to core/CCSexp.mli
diff --git a/examples/id_sexp.ml b/examples/id_sexp.ml
index 75f87a6e..a5d73e9b 100644
--- a/examples/id_sexp.ml
+++ b/examples/id_sexp.ml
@@ -3,11 +3,11 @@
 let () =
   if Array.length Sys.argv <> 2 then failwith "usage: id_sexp file";
   let f = Sys.argv.(1) in
-  let s = Sexp.L.of_file f in
+  let s = CCSexp.L.of_file f in
   match s with
   | `Ok l ->
       List.iter
-        (fun s -> Format.printf "@[%a@]@." Sexp.print s)
+        (fun s -> Format.printf "@[%a@]@." CCSexp.print s)
         l
   | `Error msg ->
       Format.printf "error: %s@." msg