diff --git a/examples/remote/curl_download.fun b/examples/extra/curl/curl_download.fun
similarity index 100%
rename from examples/remote/curl_download.fun
rename to examples/extra/curl/curl_download.fun
diff --git a/examples/remote/curl_get_json.fun b/examples/extra/curl/curl_get_json.fun
similarity index 100%
rename from examples/remote/curl_get_json.fun
rename to examples/extra/curl/curl_get_json.fun
diff --git a/examples/remote/curl_post.fun b/examples/extra/curl/curl_post.fun
similarity index 100%
rename from examples/remote/curl_post.fun
rename to examples/extra/curl/curl_post.fun
diff --git a/examples/config/ini_class_demo.fun b/examples/extra/ini/ini_class_demo.fun
similarity index 100%
rename from examples/config/ini_class_demo.fun
rename to examples/extra/ini/ini_class_demo.fun
diff --git a/examples/config/ini_complex.fun b/examples/extra/ini/ini_complex.fun
similarity index 100%
rename from examples/config/ini_complex.fun
rename to examples/extra/ini/ini_complex.fun
diff --git a/examples/config/ini_demo.fun b/examples/extra/ini/ini_demo.fun
similarity index 100%
rename from examples/config/ini_demo.fun
rename to examples/extra/ini/ini_demo.fun
diff --git a/examples/config/ini_diag.fun b/examples/extra/ini/ini_diag.fun
similarity index 100%
rename from examples/config/ini_diag.fun
rename to examples/extra/ini/ini_diag.fun
diff --git a/examples/config/ini_subsections.fun b/examples/extra/ini/ini_subsections.fun
similarity index 100%
rename from examples/config/ini_subsections.fun
rename to examples/extra/ini/ini_subsections.fun
diff --git a/examples/extra/json_showcase.fun b/examples/extra/json/json_showcase.fun
similarity index 100%
rename from examples/extra/json_showcase.fun
rename to examples/extra/json/json_showcase.fun
diff --git a/examples/crypto/libressl_md5.fun b/examples/extra/libressl/libressl_md5.fun
similarity index 100%
rename from examples/crypto/libressl_md5.fun
rename to examples/extra/libressl/libressl_md5.fun
diff --git a/examples/crypto/libressl_ripemd160.fun b/examples/extra/libressl/libressl_ripemd160.fun
similarity index 100%
rename from examples/crypto/libressl_ripemd160.fun
rename to examples/extra/libressl/libressl_ripemd160.fun
diff --git a/examples/crypto/libressl_sha256.fun b/examples/extra/libressl/libressl_sha256.fun
similarity index 100%
rename from examples/crypto/libressl_sha256.fun
rename to examples/extra/libressl/libressl_sha256.fun
diff --git a/examples/crypto/libressl_sha512.fun b/examples/extra/libressl/libressl_sha512.fun
similarity index 100%
rename from examples/crypto/libressl_sha512.fun
rename to examples/extra/libressl/libressl_sha512.fun
diff --git a/examples/extra/libsql_example.fun b/examples/extra/libsql/libsql_example.fun
similarity index 100%
rename from examples/extra/libsql_example.fun
rename to examples/extra/libsql/libsql_example.fun
diff --git a/examples/ui/notcurses_hello.fun b/examples/extra/notcurses/notcurses_hello.fun
similarity index 100%
rename from examples/ui/notcurses_hello.fun
rename to examples/extra/notcurses/notcurses_hello.fun
diff --git a/examples/ui/notcurses_menu.fun b/examples/extra/notcurses/notcurses_menu.fun
similarity index 100%
rename from examples/ui/notcurses_menu.fun
rename to examples/extra/notcurses/notcurses_menu.fun
diff --git a/examples/ui/notcurses_progress.fun b/examples/extra/notcurses/notcurses_progress.fun
similarity index 100%
rename from examples/ui/notcurses_progress.fun
rename to examples/extra/notcurses/notcurses_progress.fun
diff --git a/examples/crypto/openssl_md5.fun b/examples/extra/openssl/openssl_md5.fun
similarity index 100%
rename from examples/crypto/openssl_md5.fun
rename to examples/extra/openssl/openssl_md5.fun
diff --git a/examples/crypto/openssl_ripemd160.fun b/examples/extra/openssl/openssl_ripemd160.fun
similarity index 100%
rename from examples/crypto/openssl_ripemd160.fun
rename to examples/extra/openssl/openssl_ripemd160.fun
diff --git a/examples/crypto/openssl_sha256.fun b/examples/extra/openssl/openssl_sha256.fun
similarity index 100%
rename from examples/crypto/openssl_sha256.fun
rename to examples/extra/openssl/openssl_sha256.fun
diff --git a/examples/crypto/openssl_sha512.fun b/examples/extra/openssl/openssl_sha512.fun
similarity index 100%
rename from examples/crypto/openssl_sha512.fun
rename to examples/extra/openssl/openssl_sha512.fun
diff --git a/examples/extra/pcre2_demo.fun b/examples/extra/pcre2/pcre2_demo.fun
similarity index 100%
rename from examples/extra/pcre2_demo.fun
rename to examples/extra/pcre2/pcre2_demo.fun
diff --git a/examples/extra/pcre2_opcodes.fun b/examples/extra/pcre2/pcre2_opcodes.fun
similarity index 100%
rename from examples/extra/pcre2_opcodes.fun
rename to examples/extra/pcre2/pcre2_opcodes.fun
diff --git a/examples/extra/pcre2_showcase.fun b/examples/extra/pcre2/pcre2_showcase.fun
similarity index 100%
rename from examples/extra/pcre2_showcase.fun
rename to examples/extra/pcre2/pcre2_showcase.fun
diff --git a/examples/extra/pcsc2_example.fun b/examples/extra/pcre2/pcsc2_example.fun
similarity index 100%
rename from examples/extra/pcsc2_example.fun
rename to examples/extra/pcre2/pcsc2_example.fun
diff --git a/examples/extra/pcsc_demo.fun b/examples/extra/pcsc/pcsc_demo.fun
similarity index 100%
rename from examples/extra/pcsc_demo.fun
rename to examples/extra/pcsc/pcsc_demo.fun
diff --git a/examples/extra/pcsc_example.fun b/examples/extra/pcsc/pcsc_example.fun
similarity index 100%
rename from examples/extra/pcsc_example.fun
rename to examples/extra/pcsc/pcsc_example.fun
diff --git a/examples/sqlited/README.md b/examples/extra/sqlite/sqlited/README.md
similarity index 100%
rename from examples/sqlited/README.md
rename to examples/extra/sqlite/sqlited/README.md
diff --git a/examples/sqlited/client.fun b/examples/extra/sqlite/sqlited/client.fun
similarity index 100%
rename from examples/sqlited/client.fun
rename to examples/extra/sqlite/sqlited/client.fun
diff --git a/examples/sqlited/protocol.md b/examples/extra/sqlite/sqlited/protocol.md
similarity index 100%
rename from examples/sqlited/protocol.md
rename to examples/extra/sqlite/sqlited/protocol.md
diff --git a/examples/sqlited/server.fun b/examples/extra/sqlite/sqlited/server.fun
similarity index 100%
rename from examples/sqlited/server.fun
rename to examples/extra/sqlite/sqlited/server.fun
diff --git a/examples/ui/tk_file_manager.fun b/examples/extra/tcltk/tk_file_manager.fun
similarity index 100%
rename from examples/ui/tk_file_manager.fun
rename to examples/extra/tcltk/tk_file_manager.fun
diff --git a/examples/ui/tk_hello.fun b/examples/extra/tcltk/tk_hello.fun
similarity index 100%
rename from examples/ui/tk_hello.fun
rename to examples/extra/tcltk/tk_hello.fun
diff --git a/examples/ui/tk_testing.fun b/examples/extra/tcltk/tk_testing.fun
similarity index 100%
rename from examples/ui/tk_testing.fun
rename to examples/extra/tcltk/tk_testing.fun
diff --git a/examples/extra/xml_access_catalog.fun b/examples/extra/xml2/xml_access_catalog.fun
similarity index 100%
rename from examples/extra/xml_access_catalog.fun
rename to examples/extra/xml2/xml_access_catalog.fun
diff --git a/examples/extra/xml_access_employees.fun b/examples/extra/xml2/xml_access_employees.fun
similarity index 100%
rename from examples/extra/xml_access_employees.fun
rename to examples/extra/xml2/xml_access_employees.fun
diff --git a/examples/extra/xml_access_ns.fun b/examples/extra/xml2/xml_access_ns.fun
similarity index 100%
rename from examples/extra/xml_access_ns.fun
rename to examples/extra/xml2/xml_access_ns.fun
diff --git a/examples/extra/xml_class_example.fun b/examples/extra/xml2/xml_class_example.fun
similarity index 100%
rename from examples/extra/xml_class_example.fun
rename to examples/extra/xml2/xml_class_example.fun
diff --git a/examples/extra/xml_minimal.fun b/examples/extra/xml2/xml_minimal.fun
similarity index 100%
rename from examples/extra/xml_minimal.fun
rename to examples/extra/xml2/xml_minimal.fun