diff --git a/composer.json b/composer.json
index 4c95071..4c1bb67 100644
--- a/composer.json
+++ b/composer.json
@@ -19,14 +19,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"nulib\\": "php/src_base",
-			"nulib\\ref\\": "php/src_ref",
-			"nulib\\php\\": "php/src_php",
-			"nulib\\values\\": "php/src_values",
-			"nulib\\output\\": "php/src_output",
-			"nulib\\os\\": "php/src_os",
-			"nulib\\file\\": "php/src_file",
-			"nulib\\web\\": "php/src_web"
+			"nulib\\": "php/src"
 		}
 	},
 	"autoload-dev": {
diff --git a/php/src_base/AccessException.php b/php/src/AccessException.php
similarity index 100%
rename from php/src_base/AccessException.php
rename to php/src/AccessException.php
diff --git a/php/src_base/DataException.php b/php/src/DataException.php
similarity index 100%
rename from php/src_base/DataException.php
rename to php/src/DataException.php
diff --git a/php/src_base/ExceptionShadow.php b/php/src/ExceptionShadow.php
similarity index 100%
rename from php/src_base/ExceptionShadow.php
rename to php/src/ExceptionShadow.php
diff --git a/php/src_base/ExitException.php b/php/src/ExitException.php
similarity index 100%
rename from php/src_base/ExitException.php
rename to php/src/ExitException.php
diff --git a/php/src_base/NoMoreDataException.php b/php/src/NoMoreDataException.php
similarity index 100%
rename from php/src_base/NoMoreDataException.php
rename to php/src/NoMoreDataException.php
diff --git a/php/src_base/StateException.php b/php/src/StateException.php
similarity index 100%
rename from php/src_base/StateException.php
rename to php/src/StateException.php
diff --git a/php/src_base/StopException.php b/php/src/StopException.php
similarity index 100%
rename from php/src_base/StopException.php
rename to php/src/StopException.php
diff --git a/php/src_base/UserException.php b/php/src/UserException.php
similarity index 100%
rename from php/src_base/UserException.php
rename to php/src/UserException.php
diff --git a/php/src_base/ValueException.php b/php/src/ValueException.php
similarity index 100%
rename from php/src_base/ValueException.php
rename to php/src/ValueException.php
diff --git a/php/src_base/cl.php b/php/src/cl.php
similarity index 100%
rename from php/src_base/cl.php
rename to php/src/cl.php
diff --git a/php/src_base/cv.php b/php/src/cv.php
similarity index 100%
rename from php/src_base/cv.php
rename to php/src/cv.php
diff --git a/php/src_base/file.php b/php/src/file.php
similarity index 100%
rename from php/src_base/file.php
rename to php/src/file.php
diff --git a/php/src_file/IReader.php b/php/src/file/IReader.php
similarity index 100%
rename from php/src_file/IReader.php
rename to php/src/file/IReader.php
diff --git a/php/src_file/IWriter.php b/php/src/file/IWriter.php
similarity index 100%
rename from php/src_file/IWriter.php
rename to php/src/file/IWriter.php
diff --git a/php/src_file/_IFile.php b/php/src/file/_IFile.php
similarity index 100%
rename from php/src_file/_IFile.php
rename to php/src/file/_IFile.php
diff --git a/php/src_file/base/FileReader.php b/php/src/file/base/FileReader.php
similarity index 100%
rename from php/src_file/base/FileReader.php
rename to php/src/file/base/FileReader.php
diff --git a/php/src_file/base/FileWriter.php b/php/src/file/base/FileWriter.php
similarity index 100%
rename from php/src_file/base/FileWriter.php
rename to php/src/file/base/FileWriter.php
diff --git a/php/src_file/base/MemoryStream.php b/php/src/file/base/MemoryStream.php
similarity index 100%
rename from php/src_file/base/MemoryStream.php
rename to php/src/file/base/MemoryStream.php
diff --git a/php/src_file/base/SharedFile.php b/php/src/file/base/SharedFile.php
similarity index 100%
rename from php/src_file/base/SharedFile.php
rename to php/src/file/base/SharedFile.php
diff --git a/php/src_file/base/Stream.php b/php/src/file/base/Stream.php
similarity index 100%
rename from php/src_file/base/Stream.php
rename to php/src/file/base/Stream.php
diff --git a/php/src_file/base/TStreamFilter.php b/php/src/file/base/TStreamFilter.php
similarity index 100%
rename from php/src_file/base/TStreamFilter.php
rename to php/src/file/base/TStreamFilter.php
diff --git a/php/src_file/base/TempStream.php b/php/src/file/base/TempStream.php
similarity index 100%
rename from php/src_file/base/TempStream.php
rename to php/src/file/base/TempStream.php
diff --git a/php/src_file/base/TmpfileWriter.php b/php/src/file/base/TmpfileWriter.php
similarity index 100%
rename from php/src_file/base/TmpfileWriter.php
rename to php/src/file/base/TmpfileWriter.php
diff --git a/php/src_file/base/_File.php b/php/src/file/base/_File.php
similarity index 100%
rename from php/src_file/base/_File.php
rename to php/src/file/base/_File.php
diff --git a/php/src_file/csv/csv_flavours.php b/php/src/file/csv/csv_flavours.php
similarity index 100%
rename from php/src_file/csv/csv_flavours.php
rename to php/src/file/csv/csv_flavours.php
diff --git a/php/src_os/EOFException.php b/php/src/os/EOFException.php
similarity index 100%
rename from php/src_os/EOFException.php
rename to php/src/os/EOFException.php
diff --git a/php/src_os/IOException.php b/php/src/os/IOException.php
similarity index 100%
rename from php/src_os/IOException.php
rename to php/src/os/IOException.php
diff --git a/php/src_os/README.md b/php/src/os/README.md
similarity index 100%
rename from php/src_os/README.md
rename to php/src/os/README.md
diff --git a/php/src_os/TODO.md b/php/src/os/TODO.md
similarity index 100%
rename from php/src_os/TODO.md
rename to php/src/os/TODO.md
diff --git a/php/src_os/path.php b/php/src/os/path.php
similarity index 100%
rename from php/src_os/path.php
rename to php/src/os/path.php
diff --git a/php/src_os/sh.php b/php/src/os/sh.php
similarity index 100%
rename from php/src_os/sh.php
rename to php/src/os/sh.php
diff --git a/php/src_output/IContent.php b/php/src/output/IContent.php
similarity index 100%
rename from php/src_output/IContent.php
rename to php/src/output/IContent.php
diff --git a/php/src_output/IMessenger.php b/php/src/output/IMessenger.php
similarity index 100%
rename from php/src_output/IMessenger.php
rename to php/src/output/IMessenger.php
diff --git a/php/src_output/IPrintable.php b/php/src/output/IPrintable.php
similarity index 100%
rename from php/src_output/IPrintable.php
rename to php/src/output/IPrintable.php
diff --git a/php/src_output/TODO.md b/php/src/output/TODO.md
similarity index 100%
rename from php/src_output/TODO.md
rename to php/src/output/TODO.md
diff --git a/php/src_output/_messenger.php b/php/src/output/_messenger.php
similarity index 100%
rename from php/src_output/_messenger.php
rename to php/src/output/_messenger.php
diff --git a/php/src_output/log.php b/php/src/output/log.php
similarity index 100%
rename from php/src_output/log.php
rename to php/src/output/log.php
diff --git a/php/src_output/msg.php b/php/src/output/msg.php
similarity index 100%
rename from php/src_output/msg.php
rename to php/src/output/msg.php
diff --git a/php/src_output/out.php b/php/src/output/out.php
similarity index 100%
rename from php/src_output/out.php
rename to php/src/output/out.php
diff --git a/php/src_output/say.php b/php/src/output/say.php
similarity index 100%
rename from php/src_output/say.php
rename to php/src/output/say.php
diff --git a/php/src_output/std/ProxyMessenger.php b/php/src/output/std/ProxyMessenger.php
similarity index 100%
rename from php/src_output/std/ProxyMessenger.php
rename to php/src/output/std/ProxyMessenger.php
diff --git a/php/src_output/std/StdMessenger.php b/php/src/output/std/StdMessenger.php
similarity index 100%
rename from php/src_output/std/StdMessenger.php
rename to php/src/output/std/StdMessenger.php
diff --git a/php/src_output/std/StdOutput.php b/php/src/output/std/StdOutput.php
similarity index 100%
rename from php/src_output/std/StdOutput.php
rename to php/src/output/std/StdOutput.php
diff --git a/php/src_output/std/_IMessenger.php b/php/src/output/std/_IMessenger.php
similarity index 100%
rename from php/src_output/std/_IMessenger.php
rename to php/src/output/std/_IMessenger.php
diff --git a/php/src_php/ICloseable.php b/php/src/php/ICloseable.php
similarity index 100%
rename from php/src_php/ICloseable.php
rename to php/src/php/ICloseable.php
diff --git a/php/src_php/README.md b/php/src/php/README.md
similarity index 100%
rename from php/src_php/README.md
rename to php/src/php/README.md
diff --git a/php/src_php/coll/AutoArray.php b/php/src/php/coll/AutoArray.php
similarity index 100%
rename from php/src_php/coll/AutoArray.php
rename to php/src/php/coll/AutoArray.php
diff --git a/php/src_php/coll/BaseArray.php b/php/src/php/coll/BaseArray.php
similarity index 100%
rename from php/src_php/coll/BaseArray.php
rename to php/src/php/coll/BaseArray.php
diff --git a/php/src_php/content/IContent.php b/php/src/php/content/IContent.php
similarity index 100%
rename from php/src_php/content/IContent.php
rename to php/src/php/content/IContent.php
diff --git a/php/src_php/content/IPrintable.php b/php/src/php/content/IPrintable.php
similarity index 100%
rename from php/src_php/content/IPrintable.php
rename to php/src/php/content/IPrintable.php
diff --git a/php/src_php/content/IStaticContent.php b/php/src/php/content/IStaticContent.php
similarity index 100%
rename from php/src_php/content/IStaticContent.php
rename to php/src/php/content/IStaticContent.php
diff --git a/php/src_php/content/content.php b/php/src/php/content/content.php
similarity index 100%
rename from php/src_php/content/content.php
rename to php/src/php/content/content.php
diff --git a/php/src_php/func.php b/php/src/php/func.php
similarity index 100%
rename from php/src_php/func.php
rename to php/src/php/func.php
diff --git a/php/src_php/iter/AbstractIterator.php b/php/src/php/iter/AbstractIterator.php
similarity index 100%
rename from php/src_php/iter/AbstractIterator.php
rename to php/src/php/iter/AbstractIterator.php
diff --git a/php/src_php/json/JsonException.php b/php/src/php/json/JsonException.php
similarity index 100%
rename from php/src_php/json/JsonException.php
rename to php/src/php/json/JsonException.php
diff --git a/php/src_php/time/Date.php b/php/src/php/time/Date.php
similarity index 100%
rename from php/src_php/time/Date.php
rename to php/src/php/time/Date.php
diff --git a/php/src_php/time/DateInterval.php b/php/src/php/time/DateInterval.php
similarity index 100%
rename from php/src_php/time/DateInterval.php
rename to php/src/php/time/DateInterval.php
diff --git a/php/src_php/time/DateTime.php b/php/src/php/time/DateTime.php
similarity index 100%
rename from php/src_php/time/DateTime.php
rename to php/src/php/time/DateTime.php
diff --git a/php/src_php/time/Delay.php b/php/src/php/time/Delay.php
similarity index 100%
rename from php/src_php/time/Delay.php
rename to php/src/php/time/Delay.php
diff --git a/php/src_ref/cli/ref_args.php b/php/src/ref/cli/ref_args.php
similarity index 100%
rename from php/src_ref/cli/ref_args.php
rename to php/src/ref/cli/ref_args.php
diff --git a/php/src_ref/os/csv/ref_csv.php b/php/src/ref/os/csv/ref_csv.php
similarity index 100%
rename from php/src_ref/os/csv/ref_csv.php
rename to php/src/ref/os/csv/ref_csv.php
diff --git a/php/src_ref/php/ref_func.php b/php/src/ref/php/ref_func.php
similarity index 100%
rename from php/src_ref/php/ref_func.php
rename to php/src/ref/php/ref_func.php
diff --git a/php/src_ref/schema/ref_analyze.php b/php/src/ref/schema/ref_analyze.php
similarity index 100%
rename from php/src_ref/schema/ref_analyze.php
rename to php/src/ref/schema/ref_analyze.php
diff --git a/php/src_ref/schema/ref_schema.php b/php/src/ref/schema/ref_schema.php
similarity index 100%
rename from php/src_ref/schema/ref_schema.php
rename to php/src/ref/schema/ref_schema.php
diff --git a/php/src_ref/schema/ref_types.php b/php/src/ref/schema/ref_types.php
similarity index 100%
rename from php/src_ref/schema/ref_types.php
rename to php/src/ref/schema/ref_types.php
diff --git a/php/src_base/str.php b/php/src/str.php
similarity index 100%
rename from php/src_base/str.php
rename to php/src/str.php
diff --git a/php/src_values/akey.php b/php/src/values/akey.php
similarity index 100%
rename from php/src_values/akey.php
rename to php/src/values/akey.php
diff --git a/php/src_values/mprop.php b/php/src/values/mprop.php
similarity index 100%
rename from php/src_values/mprop.php
rename to php/src/values/mprop.php
diff --git a/php/src_values/oprop.php b/php/src/values/oprop.php
similarity index 100%
rename from php/src_values/oprop.php
rename to php/src/values/oprop.php
diff --git a/php/src_values/valm.php b/php/src/values/valm.php
similarity index 100%
rename from php/src_values/valm.php
rename to php/src/values/valm.php
diff --git a/php/src_values/valx.php b/php/src/values/valx.php
similarity index 100%
rename from php/src_values/valx.php
rename to php/src/values/valx.php
diff --git a/php/src_web/ext/CurlException.php b/php/src/web/ext/CurlException.php
similarity index 100%
rename from php/src_web/ext/CurlException.php
rename to php/src/web/ext/CurlException.php
diff --git a/php/src_web/ext/curl.php b/php/src/web/ext/curl.php
similarity index 100%
rename from php/src_web/ext/curl.php
rename to php/src/web/ext/curl.php
diff --git a/php/src_web/http.php b/php/src/web/http.php
similarity index 100%
rename from php/src_web/http.php
rename to php/src/web/http.php
diff --git a/php/src_web/params/F.php b/php/src/web/params/F.php
similarity index 100%
rename from php/src_web/params/F.php
rename to php/src/web/params/F.php
diff --git a/php/src_web/params/G.php b/php/src/web/params/G.php
similarity index 100%
rename from php/src_web/params/G.php
rename to php/src/web/params/G.php
diff --git a/php/src_web/params/P.php b/php/src/web/params/P.php
similarity index 100%
rename from php/src_web/params/P.php
rename to php/src/web/params/P.php
diff --git a/php/src_web/params/R.php b/php/src/web/params/R.php
similarity index 100%
rename from php/src_web/params/R.php
rename to php/src/web/params/R.php