diff --git a/_oasis b/_oasis
index fa5ef1ef..a46b022a 100644
--- a/_oasis
+++ b/_oasis
@@ -45,9 +45,9 @@ Library "containers"
   Path:             core
   Modules:          CCVector, CCDeque, CCGen, CCSequence, CCFQueue, CCMultiMap,
                     CCMultiSet, CCBV, CCPrint, CCPersistentHashtbl, CCError,
-                    CCHeap, CCList, CCOpt, CCPair, CCFun, CCHash, CCCat,
-                    CCKList, CCInt, CCBool, CCArray, CCBatch, CCOrd, CCIO,
-                    CCRandom, CCLinq, CCKTree, CCTrie, CCString, CCHashtbl,
+                    CCHeap, CCList, CCOpt, CCPair, CCFun, CCHash,
+                    CCKList, CCInt, CCBool, CCArray, CCOrd, CCIO,
+                    CCRandom, CCKTree, CCTrie, CCString, CCHashtbl,
                     CCFlatHashtbl
   FindlibName:      containers
 
@@ -58,6 +58,14 @@ Library "containers_string"
   FindlibName:      string
   FindlibParent:    containers
 
+Library "containers_advanced"
+  Path:             advanced
+  Pack:             true
+  Modules:          CCLinq, CCBatch, CCCat
+  FindlibName:      advanced
+  FindlibParent:    containers
+  BuildDepends:     containers
+
 Library "containers_pervasives"
   Path:             pervasives
   Modules:          CCPervasives
diff --git a/core/CCBatch.ml b/advanced/CCBatch.ml
similarity index 100%
rename from core/CCBatch.ml
rename to advanced/CCBatch.ml
diff --git a/core/CCBatch.mli b/advanced/CCBatch.mli
similarity index 100%
rename from core/CCBatch.mli
rename to advanced/CCBatch.mli
diff --git a/core/CCCat.ml b/advanced/CCCat.ml
similarity index 100%
rename from core/CCCat.ml
rename to advanced/CCCat.ml
diff --git a/core/CCCat.mli b/advanced/CCCat.mli
similarity index 100%
rename from core/CCCat.mli
rename to advanced/CCCat.mli
diff --git a/core/CCLinq.ml b/advanced/CCLinq.ml
similarity index 100%
rename from core/CCLinq.ml
rename to advanced/CCLinq.ml
diff --git a/core/CCLinq.mli b/advanced/CCLinq.mli
similarity index 100%
rename from core/CCLinq.mli
rename to advanced/CCLinq.mli