diff --git a/.idea/nur-ture.iml b/.idea/nur-ture.iml
index ae13f26..e8b45d5 100644
--- a/.idea/nur-ture.iml
+++ b/.idea/nur-ture.iml
@@ -4,10 +4,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/nur_src" isTestSource="false" packagePrefix="nur\" />
       <sourceFolder url="file://$MODULE_DIR$/nur_tests" isTestSource="true" packagePrefix="nur\" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nur\sery\wip\" />
-      <sourceFolder url="file://$MODULE_DIR$/src_app" isTestSource="false" packagePrefix="nur\sery\" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nur\sery\" />
-      <sourceFolder url="file://$MODULE_DIR$/src_glue" isTestSource="false" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="nulib\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="nulib\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/composer.json b/composer.json
index dcc65a0..796d0c3 100644
--- a/composer.json
+++ b/composer.json
@@ -64,9 +64,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"nulib\\": "src_glue",
-			"nur\\sery\\wip\\": "src",
-			"nur\\sery\\": "src_app",
+			"nulib\\": "src",
 			"nur\\": "nur_src"
 		},
 		"files": [
@@ -75,7 +73,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"nur\\sery\\": "tests",
+			"nulib\\": "tests",
 			"nur\\": "nur_tests"
 		}
 	},
diff --git a/composer.lock b/composer.lock
index aaa6402..27a5e88 100644
--- a/composer.lock
+++ b/composer.lock
@@ -589,7 +589,7 @@
             "dist": {
                 "type": "path",
                 "url": "../nulib",
-                "reference": "2cdc05981013dc403afe26c08f3cfef36f737642"
+                "reference": "1536e091fb0020858204f59462a7a80b5f9775d9"
             },
             "require": {
                 "ext-json": "*",
diff --git a/nur_bin/steam-train.php b/nur_bin/steam-train.php
index dbde68a..7d032dc 100755
--- a/nur_bin/steam-train.php
+++ b/nur_bin/steam-train.php
@@ -2,6 +2,6 @@
 <?php
 require $_composer_autoload_path?? __DIR__.'/../vendor/autoload.php';
 
-use nur\sery\tools\SteamTrainApp;
+use nulib\tools\SteamTrainApp;
 
 SteamTrainApp::run();
diff --git a/nur_src/cli/Application.php b/nur_src/cli/Application.php
index 07de6ed..19697ec 100644
--- a/nur_src/cli/Application.php
+++ b/nur_src/cli/Application.php
@@ -2,6 +2,7 @@
 namespace nur\cli;
 
 use Exception;
+use nulib\app;
 use nulib\app\RunFile;
 use nulib\ExitError;
 use nulib\ext\yaml;
@@ -16,7 +17,6 @@ use nur\config\ArrayConfig;
 use nur\msg;
 use nur\os;
 use nur\path;
-use nur\sery\app;
 
 /**
  * Class Application: application de base
diff --git a/nur_src/ref/ref_type.php b/nur_src/ref/ref_type.php
index 9dd8def..2e6474e 100644
--- a/nur_src/ref/ref_type.php
+++ b/nur_src/ref/ref_type.php
@@ -105,7 +105,7 @@ class ref_type {
   /** comme {@link c} mais nullable */
   const NCONTENT = "?".self::CONTENT;
 
-  /** comme {@link \nur\sery\FILE} mais nullable */
+  /** comme {@link FILE} mais nullable */
   const NFILE = "?".self::FILE;
 
   /** comme {@link DATETIME} mais nullable */
diff --git a/nur_tbin/base/test-args4.php b/nur_tbin/base/test-args4.php
index f3cfbc3..3ea17fc 100644
--- a/nur_tbin/base/test-args4.php
+++ b/nur_tbin/base/test-args4.php
@@ -2,7 +2,7 @@
 require(__DIR__.'/../../vendor/autoload.php');
 
 use nur\cli\Application;
-use nur\sery\output\msg;
+use nulib\output\msg;
 
 class TestArgs4 extends Application {
   protected $query;
diff --git a/src_app/app.php b/src/app.php
similarity index 99%
rename from src_app/app.php
rename to src/app.php
index 9b2828b..185df43 100644
--- a/src_app/app.php
+++ b/src/app.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery;
+namespace nulib;
 
 use nulib\A;
 use nulib\app\LockFile;
@@ -12,7 +12,7 @@ use nulib\php\func;
 use nulib\str;
 use nulib\ValueException;
 use nur\cli\Application as nur_Application;
-use nur\sery\app\cli\Application;
+use nulib\app\cli\Application;
 
 class app {
   private static function isa_Application($app): bool {
diff --git a/src_app/app/cli/Application.php b/src/app/cli/Application.php
similarity index 99%
rename from src_app/app/cli/Application.php
rename to src/app/cli/Application.php
index c432c4c..cd631be 100644
--- a/src_app/app/cli/Application.php
+++ b/src/app/cli/Application.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\app\cli;
+namespace nulib\app\cli;
 
 use Exception;
 use nulib\app\RunFile;
@@ -13,7 +13,7 @@ use nulib\ValueException;
 use nur\cli\ArgsException;
 use nur\cli\ArgsParser;
 use nur\config;
-use nur\sery\app;
+use nulib\app;
 
 /**
  * Class Application: application de base
diff --git a/src_app/app/cli/TODO.md b/src/app/cli/TODO.md
similarity index 100%
rename from src_app/app/cli/TODO.md
rename to src/app/cli/TODO.md
diff --git a/src/php/access/AbstractAccess.php b/src/php/access/AbstractAccess.php
index cffb954..fb51207 100644
--- a/src/php/access/AbstractAccess.php
+++ b/src/php/access/AbstractAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 
diff --git a/src/php/access/ArrayAccess.php b/src/php/access/ArrayAccess.php
index 96ff505..76f6786 100644
--- a/src/php/access/ArrayAccess.php
+++ b/src/php/access/ArrayAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 class ArrayAccess extends KeyAccess {
   const ALLOW_NULL = true;
diff --git a/src/php/access/ChainAccess.php b/src/php/access/ChainAccess.php
index 00529ce..3ed339e 100644
--- a/src/php/access/ChainAccess.php
+++ b/src/php/access/ChainAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 use nulib\StateException;
diff --git a/src/php/access/FormAccess.php b/src/php/access/FormAccess.php
index 2368e75..039ec50 100644
--- a/src/php/access/FormAccess.php
+++ b/src/php/access/FormAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 
diff --git a/src/php/access/GetAccess.php b/src/php/access/GetAccess.php
index ed42023..36fa7a4 100644
--- a/src/php/access/GetAccess.php
+++ b/src/php/access/GetAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 
diff --git a/src/php/access/IAccess.php b/src/php/access/IAccess.php
index a6f9b84..b81692b 100644
--- a/src/php/access/IAccess.php
+++ b/src/php/access/IAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use ReflectionClass;
 
diff --git a/src/php/access/IDeleter.php b/src/php/access/IDeleter.php
index 05634b7..e7810fb 100644
--- a/src/php/access/IDeleter.php
+++ b/src/php/access/IDeleter.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class IDeleter: une abstraction d'un objet qui permet de supprimer une valeur
diff --git a/src/php/access/IGetter.php b/src/php/access/IGetter.php
index 430d908..5ba6cc4 100644
--- a/src/php/access/IGetter.php
+++ b/src/php/access/IGetter.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class IGetter: une abstraction d'un objet qui permet d'obtenir une valeur
diff --git a/src/php/access/ISetter.php b/src/php/access/ISetter.php
index 92d3cf3..bd9321a 100644
--- a/src/php/access/ISetter.php
+++ b/src/php/access/ISetter.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class ISetter: une abstraction d'un objet qui permet de modifier une valeur
diff --git a/src/php/access/KeyAccess.php b/src/php/access/KeyAccess.php
index 356d297..47a8291 100644
--- a/src/php/access/KeyAccess.php
+++ b/src/php/access/KeyAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use ArrayAccess;
 use nulib\cl;
diff --git a/src/php/access/PostAccess.php b/src/php/access/PostAccess.php
index e9c7f13..648e4bf 100644
--- a/src/php/access/PostAccess.php
+++ b/src/php/access/PostAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\cl;
 
diff --git a/src/php/access/PropertyAccess.php b/src/php/access/PropertyAccess.php
index 0d3b705..c91529b 100644
--- a/src/php/access/PropertyAccess.php
+++ b/src/php/access/PropertyAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\StateException;
 use nulib\str;
diff --git a/src/php/access/ShadowAccess.php b/src/php/access/ShadowAccess.php
index bdd12d6..639b311 100644
--- a/src/php/access/ShadowAccess.php
+++ b/src/php/access/ShadowAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 /**
  * Class ShadowAccess: accès en lecture depuis une instance de {@link IAccess}
diff --git a/src/php/access/ValueAccess.php b/src/php/access/ValueAccess.php
index f872c9d..88ea8bd 100644
--- a/src/php/access/ValueAccess.php
+++ b/src/php/access/ValueAccess.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 class ValueAccess extends KeyAccess {
   const ALLOW_NULL = false;
diff --git a/src/php/coll/Cursor.php b/src/php/coll/Cursor.php
index b10d011..4834b50 100644
--- a/src/php/coll/Cursor.php
+++ b/src/php/coll/Cursor.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\php\coll;
+namespace nulib\php\coll;
 
 use Iterator;
 use IteratorAggregate;
 use nulib\cl;
 use nulib\php\func;
-use nur\sery\wip\php\iter;
+use nulib\php\iter;
 use Traversable;
 
 /**
diff --git a/src/php/iter.php b/src/php/iter.php
index 2501047..5c4c593 100644
--- a/src/php/iter.php
+++ b/src/php/iter.php
@@ -1,5 +1,5 @@
 <?php # -*- coding: utf-8 mode: php -*- vim:sw=2:sts=2:et:ai:si:sta:fenc=utf-8
-namespace nur\sery\wip\php;
+namespace nulib\php;
 
 use Exception;
 use Generator;
diff --git a/src/schema/OldSchema.php b/src/schema/OldSchema.php
index e3b4581..d823e4d 100644
--- a/src/schema/OldSchema.php
+++ b/src/schema/OldSchema.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 class OldSchema {
   /**
diff --git a/src/schema/Result.php b/src/schema/Result.php
index 21c2b7f..2490f5a 100644
--- a/src/schema/Result.php
+++ b/src/schema/Result.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use IteratorAggregate;
 use Throwable;
diff --git a/src/schema/Schema.php b/src/schema/Schema.php
index 180b3d6..4e81520 100644
--- a/src/schema/Schema.php
+++ b/src/schema/Schema.php
@@ -1,21 +1,21 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use ArrayAccess;
 use nulib\AccessException;
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ref\schema\ref_types;
-use nur\sery\wip\schema\_assoc\AssocSchema;
-use nur\sery\wip\schema\_list\ListSchema;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\types\tarray;
-use nur\sery\wip\schema\types\tbool;
-use nur\sery\wip\schema\types\tfunc;
-use nur\sery\wip\schema\types\tcontent;
-use nur\sery\wip\schema\types\tpkey;
-use nur\sery\wip\schema\types\trawstring;
+use nulib\schema\_assoc\AssocSchema;
+use nulib\schema\_list\ListSchema;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\types\IType;
+use nulib\schema\types\tarray;
+use nulib\schema\types\tbool;
+use nulib\schema\types\tfunc;
+use nulib\schema\types\tcontent;
+use nulib\schema\types\tpkey;
+use nulib\schema\types\trawstring;
 
 /**
  * Class Schema
diff --git a/src/schema/SchemaException.php b/src/schema/SchemaException.php
index 7561bf1..f6e3998 100644
--- a/src/schema/SchemaException.php
+++ b/src/schema/SchemaException.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use Exception;
 
diff --git a/src/schema/Wrapper.php b/src/schema/Wrapper.php
index 7ab80dd..425e0f6 100644
--- a/src/schema/Wrapper.php
+++ b/src/schema/Wrapper.php
@@ -1,15 +1,15 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use ArrayAccess;
 use IteratorAggregate;
 use nulib\php\func;
-use nur\sery\wip\schema\_assoc\AssocWrapper;
-use nur\sery\wip\schema\_list\ListWrapper;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\types\IType;
+use nulib\schema\_assoc\AssocWrapper;
+use nulib\schema\_list\ListWrapper;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\input\Input;
+use nulib\schema\types\IType;
 
 abstract class Wrapper implements ArrayAccess, IteratorAggregate {
   protected WrapperContext $context;
diff --git a/src/schema/WrapperContext.php b/src/schema/WrapperContext.php
index 8199b52..d005ea9 100644
--- a/src/schema/WrapperContext.php
+++ b/src/schema/WrapperContext.php
@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use nulib\ref\schema\ref_schema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\types\IType;
+use nulib\schema\input\Input;
+use nulib\schema\types\IType;
 
 class WrapperContext {
 
diff --git a/src/schema/_assoc/AssocSchema.php b/src/schema/_assoc/AssocSchema.php
index 2183922..2ebbc49 100644
--- a/src/schema/_assoc/AssocSchema.php
+++ b/src/schema/_assoc/AssocSchema.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 /**
  * Class AssocSchema
diff --git a/src/schema/_assoc/AssocWrapper.php b/src/schema/_assoc/AssocWrapper.php
index 9e10bd7..9d33c7f 100644
--- a/src/schema/_assoc/AssocWrapper.php
+++ b/src/schema/_assoc/AssocWrapper.php
@@ -1,16 +1,16 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\cl;
 use nulib\ref\schema\ref_analyze;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\types\IType;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 class AssocWrapper extends Wrapper {
   function __construct(AssocSchema $schema, &$value=null, $valueKey=null, ?array $params=null) {
diff --git a/src/schema/_assoc/AssocWrapperContext.php b/src/schema/_assoc/AssocWrapperContext.php
index 7536c5d..01c417e 100644
--- a/src/schema/_assoc/AssocWrapperContext.php
+++ b/src/schema/_assoc/AssocWrapperContext.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\ref\schema\ref_schema;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 class AssocWrapperContext extends WrapperContext {
 
diff --git a/src/schema/_list/ListResult.php b/src/schema/_list/ListResult.php
index d05e464..91158a1 100644
--- a/src/schema/_list/ListResult.php
+++ b/src/schema/_list/ListResult.php
@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\Result;
+use nulib\schema\Result;
 
 class ListResult extends Result {
   function __construct(Result $arrayResult, array &$keyResults) {
diff --git a/src/schema/_list/ListSchema.php b/src/schema/_list/ListSchema.php
index cdc1024..c3d2b9a 100644
--- a/src/schema/_list/ListSchema.php
+++ b/src/schema/_list/ListSchema.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 class ListSchema extends Schema {
   /** @var array meta-schema d'un schéma de nature liste */
diff --git a/src/schema/_list/ListWrapper.php b/src/schema/_list/ListWrapper.php
index 169dd98..a55c416 100644
--- a/src/schema/_list/ListWrapper.php
+++ b/src/schema/_list/ListWrapper.php
@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_list;
+namespace nulib\schema\_list;
 
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Result;
+use nulib\schema\Wrapper;
 
 abstract/*XXX*/ class ListWrapper extends Wrapper {
   function ensureKeys(): bool {
diff --git a/src/schema/_scalar/ScalarResult.php b/src/schema/_scalar/ScalarResult.php
index 82714cd..c442bdb 100644
--- a/src/schema/_scalar/ScalarResult.php
+++ b/src/schema/_scalar/ScalarResult.php
@@ -1,13 +1,13 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\cl;
 use nulib\ref\schema\ref_analyze;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Result;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 use Throwable;
 
 /**
diff --git a/src/schema/_scalar/ScalarSchema.php b/src/schema/_scalar/ScalarSchema.php
index ec261bc..29deca5 100644
--- a/src/schema/_scalar/ScalarSchema.php
+++ b/src/schema/_scalar/ScalarSchema.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\cl;
 use nulib\ref\schema\ref_schema;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\Wrapper;
+use nulib\schema\Schema;
+use nulib\schema\Wrapper;
 
 /**
  * Class ScalarSchema
diff --git a/src/schema/_scalar/ScalarWrapper.php b/src/schema/_scalar/ScalarWrapper.php
index c5b24c8..1f43f4b 100644
--- a/src/schema/_scalar/ScalarWrapper.php
+++ b/src/schema/_scalar/ScalarWrapper.php
@@ -1,14 +1,14 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\php\func;
 use nulib\ref\schema\ref_analyze;
 use nulib\ValueException;
-use nur\sery\wip\schema\Schema;
-use nur\sery\wip\schema\types;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\Wrapper;
-use nur\sery\wip\schema\WrapperContext;
+use nulib\schema\Schema;
+use nulib\schema\types;
+use nulib\schema\types\IType;
+use nulib\schema\Wrapper;
+use nulib\schema\WrapperContext;
 
 /**
  * Class ScalarWrapper
diff --git a/src/schema/input/FormInput.php b/src/schema/input/FormInput.php
index 1b043d5..5bc39f8 100644
--- a/src/schema/input/FormInput.php
+++ b/src/schema/input/FormInput.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
 #XXX implémenter le renommage de paramètres et faire des méthodes pour
 # construire des querystring et paramètres de formulaires
-use nur\sery\wip\php\access\FormAccess;
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\ShadowAccess;
+use nulib\php\access\FormAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\ShadowAccess;
 
 /**
  * Class FormInput: accès à des paramètres de formulaire (POST ou GET, dans cet
diff --git a/src/schema/input/GetInput.php b/src/schema/input/GetInput.php
index 558e1ab..3bee322 100644
--- a/src/schema/input/GetInput.php
+++ b/src/schema/input/GetInput.php
@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
-use nur\sery\wip\php\access\GetAccess;
-use nur\sery\wip\php\access\IAccess;
+use nulib\php\access\GetAccess;
+use nulib\php\access\IAccess;
 
 /**
  * Class GetInput: accès à des paramètres de formulaire de type GET uniquement
diff --git a/src/schema/input/Input.php b/src/schema/input/Input.php
index 4973195..59eefaa 100644
--- a/src/schema/input/Input.php
+++ b/src/schema/input/Input.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
 use nulib\ref\schema\ref_input;
 use nulib\StateException;
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\KeyAccess;
-use nur\sery\wip\php\access\PropertyAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\KeyAccess;
+use nulib\php\access\PropertyAccess;
 
 /**
  * Class Input: accès à une valeur
diff --git a/src/schema/input/PostInput.php b/src/schema/input/PostInput.php
index 9b5fef6..47afe22 100644
--- a/src/schema/input/PostInput.php
+++ b/src/schema/input/PostInput.php
@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\input;
+namespace nulib\schema\input;
 
-use nur\sery\wip\php\access\IAccess;
-use nur\sery\wip\php\access\PostAccess;
+use nulib\php\access\IAccess;
+use nulib\php\access\PostAccess;
 
 /**
  * Class PostInput: accès à des paramètres de formulaire de type POST uniquement
diff --git a/src/schema/types.php b/src/schema/types.php
index 117e779..ab4f33d 100644
--- a/src/schema/types.php
+++ b/src/schema/types.php
@@ -1,22 +1,22 @@
 <?php
-namespace nur\sery\wip\schema;
+namespace nulib\schema;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\types\IType;
-use nur\sery\wip\schema\types\Registry;
-use nur\sery\wip\schema\types\tarray;
-use nur\sery\wip\schema\types\tbool;
-use nur\sery\wip\schema\types\tfunc;
-use nur\sery\wip\schema\types\tcontent;
-use nur\sery\wip\schema\types\tfloat;
-use nur\sery\wip\schema\types\tint;
-use nur\sery\wip\schema\types\tkey;
-use nur\sery\wip\schema\types\tmixed;
-use nur\sery\wip\schema\types\tpkey;
-use nur\sery\wip\schema\types\traw;
-use nur\sery\wip\schema\types\trawstring;
-use nur\sery\wip\schema\types\tstring;
-use nur\sery\wip\schema\types\ttext;
+use nulib\schema\types\IType;
+use nulib\schema\types\Registry;
+use nulib\schema\types\tarray;
+use nulib\schema\types\tbool;
+use nulib\schema\types\tfunc;
+use nulib\schema\types\tcontent;
+use nulib\schema\types\tfloat;
+use nulib\schema\types\tint;
+use nulib\schema\types\tkey;
+use nulib\schema\types\tmixed;
+use nulib\schema\types\tpkey;
+use nulib\schema\types\traw;
+use nulib\schema\types\trawstring;
+use nulib\schema\types\tstring;
+use nulib\schema\types\ttext;
 
 /**
  * Class types: classe outil pour gérer le registre de types
diff --git a/src/schema/types/IType.php b/src/schema/types/IType.php
index 574d5e4..e94fb80 100644
--- a/src/schema/types/IType.php
+++ b/src/schema/types/IType.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 /**
  * Interface IType: un type de données
diff --git a/src/schema/types/Registry.php b/src/schema/types/Registry.php
index f8373cf..15212a1 100644
--- a/src/schema/types/Registry.php
+++ b/src/schema/types/Registry.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\php\func;
diff --git a/src/schema/types/_tformatable.php b/src/schema/types/_tformatable.php
index b2bf084..3ba087c 100644
--- a/src/schema/types/_tformatable.php
+++ b/src/schema/types/_tformatable.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 abstract class _tformatable extends _tsimple {
   const FORMAT = null;
diff --git a/src/schema/types/_tsimple.php b/src/schema/types/_tsimple.php
index 072806e..94ab013 100644
--- a/src/schema/types/_tsimple.php
+++ b/src/schema/types/_tsimple.php
@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\StateException;
 use nur\prop;
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 use nur\str;
 
 abstract class _tsimple implements IType {
diff --git a/src/schema/types/_tstring.php b/src/schema/types/_tstring.php
index 782f2e6..968db1e 100644
--- a/src/schema/types/_tstring.php
+++ b/src/schema/types/_tstring.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\str;
 
diff --git a/src/schema/types/_tunion.php b/src/schema/types/_tunion.php
index 113e02d..1d3e7ee 100644
--- a/src/schema/types/_tunion.php
+++ b/src/schema/types/_tunion.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 abstract class _tunion extends _tsimple {
   function getPhpType(bool $allowNullable=true): ?string {
diff --git a/src/schema/types/tarray.php b/src/schema/types/tarray.php
index 0f55ea3..b77de54 100644
--- a/src/schema/types/tarray.php
+++ b/src/schema/types/tarray.php
@@ -1,12 +1,12 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tarray extends _tstring {
   const NAME = "array";
diff --git a/src/schema/types/tbool.php b/src/schema/types/tbool.php
index a8e9e3d..1d62eef 100644
--- a/src/schema/types/tbool.php
+++ b/src/schema/types/tbool.php
@@ -1,14 +1,14 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\cl;
 use nulib\ValueException;
 use nur\prop;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tbool extends _tformatable {
   const NAME = "bool";
diff --git a/src/schema/types/tcontent.php b/src/schema/types/tcontent.php
index b885a56..6316012 100644
--- a/src/schema/types/tcontent.php
+++ b/src/schema/types/tcontent.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\php\content\c;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 abstract class tcontent extends _tunion {
   const NAME = "content";
diff --git a/src/schema/types/tfloat.php b/src/schema/types/tfloat.php
index 70118c5..6202db5 100644
--- a/src/schema/types/tfloat.php
+++ b/src/schema/types/tfloat.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tfloat extends _tformatable {
   const NAME = "float";
diff --git a/src/schema/types/tfunc.php b/src/schema/types/tfunc.php
index e13a39f..0ca3622 100644
--- a/src/schema/types/tfunc.php
+++ b/src/schema/types/tfunc.php
@@ -1,13 +1,13 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\php\func;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tfunc extends _tsimple {
   const NAME = "func";
diff --git a/src/schema/types/tgeneric.php b/src/schema/types/tgeneric.php
index 09a115d..9d948a6 100644
--- a/src/schema/types/tgeneric.php
+++ b/src/schema/types/tgeneric.php
@@ -1,12 +1,12 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tgeneric extends _tsimple {
   function __construct(string $class, bool $nullable, ?array $params=null) {
diff --git a/src/schema/types/tint.php b/src/schema/types/tint.php
index a1a98e0..cfc1a18 100644
--- a/src/schema/types/tint.php
+++ b/src/schema/types/tint.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tint extends _tformatable {
   const NAME = "int";
diff --git a/src/schema/types/tkey.php b/src/schema/types/tkey.php
index f3f0f5d..cf72006 100644
--- a/src/schema/types/tkey.php
+++ b/src/schema/types/tkey.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tkey extends _tunion {
   const NAME = "key";
diff --git a/src/schema/types/tmixed.php b/src/schema/types/tmixed.php
index 5fa3e85..045cebf 100644
--- a/src/schema/types/tmixed.php
+++ b/src/schema/types/tmixed.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\input\Input;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\input\Input;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tmixed extends _tsimple {
   const NAME = "mixed";
diff --git a/src/schema/types/tpkey.php b/src/schema/types/tpkey.php
index 20c9c77..cf4dcd5 100644
--- a/src/schema/types/tpkey.php
+++ b/src/schema/types/tpkey.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class tpkey extends _tunion {
   const NAME = "pkey";
diff --git a/src/schema/types/traw.php b/src/schema/types/traw.php
index b187b3f..3a5135b 100644
--- a/src/schema/types/traw.php
+++ b/src/schema/types/traw.php
@@ -1,7 +1,7 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 
 class traw extends tmixed {
   const NAME = "raw";
diff --git a/src/schema/types/trawstring.php b/src/schema/types/trawstring.php
index 938242d..eafdb48 100644
--- a/src/schema/types/trawstring.php
+++ b/src/schema/types/trawstring.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\str;
-use nur\sery\wip\schema\_scalar\ScalarResult;
-use nur\sery\wip\schema\_scalar\ScalarSchema;
-use nur\sery\wip\schema\Result;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarResult;
+use nulib\schema\_scalar\ScalarSchema;
+use nulib\schema\Result;
+use nulib\schema\Schema;
 
 class trawstring extends _tstring {
   const NAME = "rawstring";
diff --git a/src/schema/types/tstring.php b/src/schema/types/tstring.php
index 0e45d99..536f87d 100644
--- a/src/schema/types/tstring.php
+++ b/src/schema/types/tstring.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 class tstring extends trawstring {
   const NAME = "string";
diff --git a/src/schema/types/ttext.php b/src/schema/types/ttext.php
index 755d1e6..0977285 100644
--- a/src/schema/types/ttext.php
+++ b/src/schema/types/ttext.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 class ttext extends trawstring {
   const NAME = "text";
diff --git a/src_glue/tools/Csv2xlsxApp.php b/src/tools/Csv2xlsxApp.php
similarity index 100%
rename from src_glue/tools/Csv2xlsxApp.php
rename to src/tools/Csv2xlsxApp.php
diff --git a/src_glue/tools/DumpserApp.php b/src/tools/DumpserApp.php
similarity index 100%
rename from src_glue/tools/DumpserApp.php
rename to src/tools/DumpserApp.php
diff --git a/src/web/content/Tag.php b/src/web/content/Tag.php
index c80ce52..e50da56 100644
--- a/src/web/content/Tag.php
+++ b/src/web/content/Tag.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\web\content;
+namespace nulib\web\content;
 
 
 use nulib\A;
diff --git a/src/web/content/v.php b/src/web/content/v.php
index 60f393c..e6d7fbb 100644
--- a/src/web/content/v.php
+++ b/src/web/content/v.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\web\content;
+namespace nulib\web\content;
 
 /**
  * Class v: classe outil pour gérer du contenu pour le web
diff --git a/src_glue/app.php b/src_glue/app.php
deleted file mode 100644
index 5247674..0000000
--- a/src_glue/app.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-namespace nulib;
-
-class app extends \nur\sery\app {
-}
diff --git a/src_glue/app/cli/Application.php b/src_glue/app/cli/Application.php
deleted file mode 100644
index 677f47c..0000000
--- a/src_glue/app/cli/Application.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-namespace nulib\app\cli;
-
-abstract class Application extends \nur\sery\app\cli\Application {
-}
diff --git a/tests/wip/php/access/KeyAccessTest.php b/tests/php/access/KeyAccessTest.php
similarity index 99%
rename from tests/wip/php/access/KeyAccessTest.php
rename to tests/php/access/KeyAccessTest.php
index 8911ccd..b654050 100644
--- a/tests/wip/php/access/KeyAccessTest.php
+++ b/tests/php/access/KeyAccessTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\access;
+namespace nulib\php\access;
 
 use nulib\tests\TestCase;
 use stdClass;
diff --git a/tests/wip/php/coll/CursorTest.php b/tests/php/coll/CursorTest.php
similarity index 99%
rename from tests/wip/php/coll/CursorTest.php
rename to tests/php/coll/CursorTest.php
index f28bc95..af76c0a 100644
--- a/tests/wip/php/coll/CursorTest.php
+++ b/tests/php/coll/CursorTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\coll;
+namespace nulib\php\coll;
 
 use Exception;
 use nulib\cl;
diff --git a/tests/wip/php/content/cTest.php b/tests/php/content/cTest.php
similarity index 92%
rename from tests/wip/php/content/cTest.php
rename to tests/php/content/cTest.php
index e740799..d672bf1 100644
--- a/tests/wip/php/content/cTest.php
+++ b/tests/php/content/cTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\php\content;
+namespace nulib\php\content;
 
 use nulib\php\content\c;
-use nur\sery\wip\php\content\impl\html;
-use nur\sery\wip\web\content\v;
+use nulib\php\content\impl\html;
+use nulib\web\content\v;
 use PHPUnit\Framework\TestCase;
 
 class cTest extends TestCase {
diff --git a/tests/wip/php/content/impl/AContent.php b/tests/php/content/impl/AContent.php
similarity index 79%
rename from tests/wip/php/content/impl/AContent.php
rename to tests/php/content/impl/AContent.php
index a350978..c53c376 100644
--- a/tests/wip/php/content/impl/AContent.php
+++ b/tests/php/content/impl/AContent.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\IContent;
 
diff --git a/tests/wip/php/content/impl/APrintable.php b/tests/php/content/impl/APrintable.php
similarity index 77%
rename from tests/wip/php/content/impl/APrintable.php
rename to tests/php/content/impl/APrintable.php
index 1499f0b..7a75c2f 100644
--- a/tests/wip/php/content/impl/APrintable.php
+++ b/tests/php/content/impl/APrintable.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\IPrintable;
 
diff --git a/tests/wip/php/content/impl/ATag.php b/tests/php/content/impl/ATag.php
similarity index 90%
rename from tests/wip/php/content/impl/ATag.php
rename to tests/php/content/impl/ATag.php
index e9599b4..b4cc2ed 100644
--- a/tests/wip/php/content/impl/ATag.php
+++ b/tests/php/content/impl/ATag.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 use nulib\php\content\c;
 use nulib\php\content\IContent;
diff --git a/tests/wip/php/content/impl/html.php b/tests/php/content/impl/html.php
similarity index 91%
rename from tests/wip/php/content/impl/html.php
rename to tests/php/content/impl/html.php
index d63bb8a..3567b2e 100644
--- a/tests/wip/php/content/impl/html.php
+++ b/tests/php/content/impl/html.php
@@ -1,5 +1,5 @@
 <?php
-namespace nur\sery\wip\php\content\impl;
+namespace nulib\php\content\impl;
 
 class html {
   const H1 = [self::class, "h1"];
diff --git a/tests/wip/schema/_assoc/AssocSchemaTest.php b/tests/schema/_assoc/AssocSchemaTest.php
similarity index 98%
rename from tests/wip/schema/_assoc/AssocSchemaTest.php
rename to tests/schema/_assoc/AssocSchemaTest.php
index d8552a7..c8e6c0d 100644
--- a/tests/wip/schema/_assoc/AssocSchemaTest.php
+++ b/tests/schema/_assoc/AssocSchemaTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace nur\sery\wip\schema\_assoc;
+namespace nulib\schema\_assoc;
 
 use nulib\ext\yaml;
 use nulib\tests\TestCase;
 use nulib\ValueException;
-use nur\sery\wip\schema\_scalar\ScalarSchemaTest;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarSchemaTest;
+use nulib\schema\Schema;
 
 class AssocSchemaTest extends TestCase {
   const NULL_SCHEMA = [
diff --git a/tests/wip/schema/_scalar/ScalarSchemaTest.php b/tests/schema/_scalar/ScalarSchemaTest.php
similarity index 96%
rename from tests/wip/schema/_scalar/ScalarSchemaTest.php
rename to tests/schema/_scalar/ScalarSchemaTest.php
index 5742fb8..916fba5 100644
--- a/tests/wip/schema/_scalar/ScalarSchemaTest.php
+++ b/tests/schema/_scalar/ScalarSchemaTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\SchemaException;
+use nulib\schema\SchemaException;
 
 class ScalarSchemaTest extends TestCase {
   const NULL_SCHEMA = [
diff --git a/tests/wip/schema/_scalar/ScalarWrapperTest.php b/tests/schema/_scalar/ScalarWrapperTest.php
similarity index 99%
rename from tests/wip/schema/_scalar/ScalarWrapperTest.php
rename to tests/schema/_scalar/ScalarWrapperTest.php
index cc03952..fc2a046 100644
--- a/tests/wip/schema/_scalar/ScalarWrapperTest.php
+++ b/tests/schema/_scalar/ScalarWrapperTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\_scalar;
+namespace nulib\schema\_scalar;
 
 use nulib\tests\TestCase;
 use nulib\ValueException;
-use nur\sery\wip\schema\input\Input;
+use nulib\schema\input\Input;
 use stdClass;
 
 class ScalarWrapperTest extends TestCase {
diff --git a/tests/wip/schema/types/boolTest.php b/tests/schema/types/boolTest.php
similarity index 96%
rename from tests/wip/schema/types/boolTest.php
rename to tests/schema/types/boolTest.php
index 8fa9308..00bccc4 100644
--- a/tests/wip/schema/types/boolTest.php
+++ b/tests/schema/types/boolTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class boolTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {
diff --git a/tests/wip/schema/types/floatTest.php b/tests/schema/types/floatTest.php
similarity index 97%
rename from tests/wip/schema/types/floatTest.php
rename to tests/schema/types/floatTest.php
index f6340a2..eed9228 100644
--- a/tests/wip/schema/types/floatTest.php
+++ b/tests/schema/types/floatTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class floatTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {
diff --git a/tests/wip/schema/types/intTest.php b/tests/schema/types/intTest.php
similarity index 97%
rename from tests/wip/schema/types/intTest.php
rename to tests/schema/types/intTest.php
index 51cd7f9..223716a 100644
--- a/tests/wip/schema/types/intTest.php
+++ b/tests/schema/types/intTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class intTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {
diff --git a/tests/wip/schema/types/strTest.php b/tests/schema/types/strTest.php
similarity index 96%
rename from tests/wip/schema/types/strTest.php
rename to tests/schema/types/strTest.php
index fd8f142..9955001 100644
--- a/tests/wip/schema/types/strTest.php
+++ b/tests/schema/types/strTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use Exception;
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class strTest extends TestCase {
   function commonTests($wrapper, &$value, callable $wrapperSetter): void {
diff --git a/tests/wip/schema/types/unionTest.php b/tests/schema/types/unionTest.php
similarity index 83%
rename from tests/wip/schema/types/unionTest.php
rename to tests/schema/types/unionTest.php
index 7557420..1e65cfe 100644
--- a/tests/wip/schema/types/unionTest.php
+++ b/tests/schema/types/unionTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace nur\sery\wip\schema\types;
+namespace nulib\schema\types;
 
 use nulib\tests\TestCase;
-use nur\sery\wip\schema\_scalar\ScalarWrapper;
-use nur\sery\wip\schema\Schema;
+use nulib\schema\_scalar\ScalarWrapper;
+use nulib\schema\Schema;
 
 class unionTest extends TestCase {
   function testUnionTypes() {