diff --git a/GNUmakefile b/GNUmakefile
index b13f7a479..ec51c8930 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -135,7 +135,7 @@ lint:
 	@echo $$(sed -n '/^\tlocal exclude_files/,/^}/p;' .luacheckrc | sed '1d;$d' | wc -l) files ignored
 	shellcheck configure
 
-vpath %.tl teal-src/
+vpath %.tl teal-src/prosody
 %.lua: %.tl
 	tl -I teal-src/ --gen-compat off --gen-target 5.1 gen $^ -o $@
 	-lua-format -i $@
diff --git a/teal-src/module.d.tl b/teal-src/module.d.tl
index 24eb9558f..62c36b292 100644
--- a/teal-src/module.d.tl
+++ b/teal-src/module.d.tl
@@ -1,4 +1,4 @@
-local st = require"util.stanza"
+local st = require "prosody.util.stanza"
 
 global record moduleapi
 	get_name : function (moduleapi) : string
diff --git a/teal-src/core/storagemanager.d.tl b/teal-src/prosody/core/storagemanager.d.tl
similarity index 97%
rename from teal-src/core/storagemanager.d.tl
rename to teal-src/prosody/core/storagemanager.d.tl
index 3c8253b1b..bd82357cf 100644
--- a/teal-src/core/storagemanager.d.tl
+++ b/teal-src/prosody/core/storagemanager.d.tl
@@ -4,7 +4,7 @@
 
 -- Key-Value stores (the default)
 
-local stanza = require"util.stanza".stanza_t
+local stanza = require"prosody.util.stanza".stanza_t
 
 local record keyval_store
 	get : function ( keyval_store, string ) : any , string
diff --git a/teal-src/core/usermanager.d.tl b/teal-src/prosody/core/usermanager.d.tl
similarity index 97%
rename from teal-src/core/usermanager.d.tl
rename to teal-src/prosody/core/usermanager.d.tl
index a546a53cb..fc055004c 100644
--- a/teal-src/core/usermanager.d.tl
+++ b/teal-src/prosody/core/usermanager.d.tl
@@ -1,4 +1,4 @@
-local Role = require "util.roles".Role;
+local Role = require "prosody.util.roles".Role;
 
 local record usermanager
 	record AuthProvider
diff --git a/teal-src/net/http.d.tl b/teal-src/prosody/net/http.d.tl
similarity index 96%
rename from teal-src/net/http.d.tl
rename to teal-src/prosody/net/http.d.tl
index 9135ec12e..08542e456 100644
--- a/teal-src/net/http.d.tl
+++ b/teal-src/prosody/net/http.d.tl
@@ -1,4 +1,4 @@
-local Promise = require "util.promise".Promise;
+local Promise = require "prosody.util.promise".Promise;
 
 local record sslctx -- from LuaSec
 end
diff --git a/teal-src/net/http/codes.d.tl b/teal-src/prosody/net/http/codes.d.tl
similarity index 100%
rename from teal-src/net/http/codes.d.tl
rename to teal-src/prosody/net/http/codes.d.tl
diff --git a/teal-src/net/http/errors.d.tl b/teal-src/prosody/net/http/errors.d.tl
similarity index 100%
rename from teal-src/net/http/errors.d.tl
rename to teal-src/prosody/net/http/errors.d.tl
diff --git a/teal-src/net/http/files.d.tl b/teal-src/prosody/net/http/files.d.tl
similarity index 100%
rename from teal-src/net/http/files.d.tl
rename to teal-src/prosody/net/http/files.d.tl
diff --git a/teal-src/net/http/parser.d.tl b/teal-src/prosody/net/http/parser.d.tl
similarity index 100%
rename from teal-src/net/http/parser.d.tl
rename to teal-src/prosody/net/http/parser.d.tl
diff --git a/teal-src/net/http/server.d.tl b/teal-src/prosody/net/http/server.d.tl
similarity index 100%
rename from teal-src/net/http/server.d.tl
rename to teal-src/prosody/net/http/server.d.tl
diff --git a/teal-src/net/server.d.tl b/teal-src/prosody/net/server.d.tl
similarity index 100%
rename from teal-src/net/server.d.tl
rename to teal-src/prosody/net/server.d.tl
diff --git a/teal-src/plugins/mod_cron.tl b/teal-src/prosody/plugins/mod_cron.tl
similarity index 96%
rename from teal-src/plugins/mod_cron.tl
rename to teal-src/prosody/plugins/mod_cron.tl
index 7fa2a36b4..b71b5f74b 100644
--- a/teal-src/plugins/mod_cron.tl
+++ b/teal-src/prosody/plugins/mod_cron.tl
@@ -1,7 +1,7 @@
 module:set_global();
 
-local async = require "util.async";
-local datetime = require "util.datetime";
+local async = require "prosody.util.async";
+local datetime = require "prosody.util.datetime";
 
 local record map_store<K,V>
 	-- TODO move to somewhere sensible
diff --git a/teal-src/plugins/muc/muc.lib.d.tl b/teal-src/prosody/plugins/muc/muc.lib.d.tl
similarity index 99%
rename from teal-src/plugins/muc/muc.lib.d.tl
rename to teal-src/prosody/plugins/muc/muc.lib.d.tl
index 1e967d7ba..6e9663a1d 100644
--- a/teal-src/plugins/muc/muc.lib.d.tl
+++ b/teal-src/prosody/plugins/muc/muc.lib.d.tl
@@ -1,4 +1,4 @@
-local Stanza = require "util.stanza".stanza_t
+local Stanza = require "prosody.util.stanza".stanza_t
 
 local record Room
 	jid : string
diff --git a/teal-src/util/array.d.tl b/teal-src/prosody/util/array.d.tl
similarity index 100%
rename from teal-src/util/array.d.tl
rename to teal-src/prosody/util/array.d.tl
diff --git a/teal-src/util/async.d.tl b/teal-src/prosody/util/async.d.tl
similarity index 100%
rename from teal-src/util/async.d.tl
rename to teal-src/prosody/util/async.d.tl
diff --git a/teal-src/util/bitcompat.d.tl b/teal-src/prosody/util/bitcompat.d.tl
similarity index 100%
rename from teal-src/util/bitcompat.d.tl
rename to teal-src/prosody/util/bitcompat.d.tl
diff --git a/teal-src/util/compat.d.tl b/teal-src/prosody/util/compat.d.tl
similarity index 100%
rename from teal-src/util/compat.d.tl
rename to teal-src/prosody/util/compat.d.tl
diff --git a/teal-src/util/crand.d.tl b/teal-src/prosody/util/crand.d.tl
similarity index 100%
rename from teal-src/util/crand.d.tl
rename to teal-src/prosody/util/crand.d.tl
diff --git a/teal-src/util/crypto.d.tl b/teal-src/prosody/util/crypto.d.tl
similarity index 100%
rename from teal-src/util/crypto.d.tl
rename to teal-src/prosody/util/crypto.d.tl
diff --git a/teal-src/util/dataforms.d.tl b/teal-src/prosody/util/dataforms.d.tl
similarity index 93%
rename from teal-src/util/dataforms.d.tl
rename to teal-src/prosody/util/dataforms.d.tl
index 0eddf98e6..3dad2776b 100644
--- a/teal-src/util/dataforms.d.tl
+++ b/teal-src/prosody/util/dataforms.d.tl
@@ -1,4 +1,4 @@
-local stanza_t = require "util.stanza".stanza_t
+local stanza_t = require "prosody.util.stanza".stanza_t
 
 local record lib
 	record dataform
diff --git a/teal-src/util/datamapper.tl b/teal-src/prosody/util/datamapper.tl
similarity index 97%
rename from teal-src/util/datamapper.tl
rename to teal-src/prosody/util/datamapper.tl
index 4ff3a02c9..89d5e29b0 100644
--- a/teal-src/util/datamapper.tl
+++ b/teal-src/prosody/util/datamapper.tl
@@ -19,14 +19,14 @@
 -- TODO s/number/integer/ once we have appropriate math.type() compat
 --
 
-if not math.type then require "util.mathcompat" end
+if not math.type then require "prosody.util.mathcompat" end
 
-local st = require "util.stanza";
-local json = require"util.json"
-local pointer = require"util.jsonpointer";
+local st = require "prosody.util.stanza";
+local json = require "prosody.util.json"
+local pointer = require "prosody.util.jsonpointer";
 
 local json_type_name = json.json_type_name;
-local json_schema_object = require "util.jsonschema"
+local json_schema_object = require "prosody.util.jsonschema"
 local type schema_t = boolean | json_schema_object
 
 local function toboolean ( s : string ) : boolean
diff --git a/teal-src/util/datetime.d.tl b/teal-src/prosody/util/datetime.d.tl
similarity index 100%
rename from teal-src/util/datetime.d.tl
rename to teal-src/prosody/util/datetime.d.tl
diff --git a/teal-src/util/encodings.d.tl b/teal-src/prosody/util/encodings.d.tl
similarity index 100%
rename from teal-src/util/encodings.d.tl
rename to teal-src/prosody/util/encodings.d.tl
diff --git a/teal-src/util/error.d.tl b/teal-src/prosody/util/error.d.tl
similarity index 100%
rename from teal-src/util/error.d.tl
rename to teal-src/prosody/util/error.d.tl
diff --git a/teal-src/util/format.d.tl b/teal-src/prosody/util/format.d.tl
similarity index 100%
rename from teal-src/util/format.d.tl
rename to teal-src/prosody/util/format.d.tl
diff --git a/teal-src/util/hashes.d.tl b/teal-src/prosody/util/hashes.d.tl
similarity index 100%
rename from teal-src/util/hashes.d.tl
rename to teal-src/prosody/util/hashes.d.tl
diff --git a/teal-src/util/hex.d.tl b/teal-src/prosody/util/hex.d.tl
similarity index 100%
rename from teal-src/util/hex.d.tl
rename to teal-src/prosody/util/hex.d.tl
diff --git a/teal-src/util/http.d.tl b/teal-src/prosody/util/http.d.tl
similarity index 100%
rename from teal-src/util/http.d.tl
rename to teal-src/prosody/util/http.d.tl
diff --git a/teal-src/util/human/io.d.tl b/teal-src/prosody/util/human/io.d.tl
similarity index 100%
rename from teal-src/util/human/io.d.tl
rename to teal-src/prosody/util/human/io.d.tl
diff --git a/teal-src/util/human/units.d.tl b/teal-src/prosody/util/human/units.d.tl
similarity index 100%
rename from teal-src/util/human/units.d.tl
rename to teal-src/prosody/util/human/units.d.tl
diff --git a/teal-src/util/id.d.tl b/teal-src/prosody/util/id.d.tl
similarity index 100%
rename from teal-src/util/id.d.tl
rename to teal-src/prosody/util/id.d.tl
diff --git a/teal-src/util/interpolation.d.tl b/teal-src/prosody/util/interpolation.d.tl
similarity index 100%
rename from teal-src/util/interpolation.d.tl
rename to teal-src/prosody/util/interpolation.d.tl
diff --git a/teal-src/util/ip.d.tl b/teal-src/prosody/util/ip.d.tl
similarity index 100%
rename from teal-src/util/ip.d.tl
rename to teal-src/prosody/util/ip.d.tl
diff --git a/teal-src/util/jid.d.tl b/teal-src/prosody/util/jid.d.tl
similarity index 100%
rename from teal-src/util/jid.d.tl
rename to teal-src/prosody/util/jid.d.tl
diff --git a/teal-src/util/json.d.tl b/teal-src/prosody/util/json.d.tl
similarity index 100%
rename from teal-src/util/json.d.tl
rename to teal-src/prosody/util/json.d.tl
diff --git a/teal-src/util/jsonpointer.tl b/teal-src/prosody/util/jsonpointer.tl
similarity index 100%
rename from teal-src/util/jsonpointer.tl
rename to teal-src/prosody/util/jsonpointer.tl
diff --git a/teal-src/util/jsonschema.tl b/teal-src/prosody/util/jsonschema.tl
similarity index 98%
rename from teal-src/util/jsonschema.tl
rename to teal-src/prosody/util/jsonschema.tl
index 14b043703..8e5d69bc9 100644
--- a/teal-src/util/jsonschema.tl
+++ b/teal-src/prosody/util/jsonschema.tl
@@ -8,12 +8,12 @@
 -- https://json-schema.org/draft/2020-12/json-schema-validation.html
 --
 
-if not math.type then require "util.mathcompat" end
+if not math.type then require "prosody.util.mathcompat" end
 
-local json = require"util.json"
+local json = require "prosody.util.json"
 local null = json.null;
 
-local pointer = require "util.jsonpointer"
+local pointer = require "prosody.util.jsonpointer"
 
 local type json_type_name = json.json_type_name
 
diff --git a/teal-src/util/jwt.d.tl b/teal-src/prosody/util/jwt.d.tl
similarity index 95%
rename from teal-src/util/jwt.d.tl
rename to teal-src/prosody/util/jwt.d.tl
index 929d74192..b3d0cd9e4 100644
--- a/teal-src/util/jwt.d.tl
+++ b/teal-src/prosody/util/jwt.d.tl
@@ -1,4 +1,4 @@
-local crypto = require "util.crypto"
+local crypto = require "prosody.util.crypto"
 local record jwtlib
 	enum algorithm
 		"HS256"
diff --git a/teal-src/util/logger.d.tl b/teal-src/prosody/util/logger.d.tl
similarity index 100%
rename from teal-src/util/logger.d.tl
rename to teal-src/prosody/util/logger.d.tl
diff --git a/teal-src/util/mathcompat.tl b/teal-src/prosody/util/mathcompat.tl
similarity index 100%
rename from teal-src/util/mathcompat.tl
rename to teal-src/prosody/util/mathcompat.tl
diff --git a/teal-src/util/net.d.tl b/teal-src/prosody/util/net.d.tl
similarity index 100%
rename from teal-src/util/net.d.tl
rename to teal-src/prosody/util/net.d.tl
diff --git a/teal-src/util/poll.d.tl b/teal-src/prosody/util/poll.d.tl
similarity index 100%
rename from teal-src/util/poll.d.tl
rename to teal-src/prosody/util/poll.d.tl
diff --git a/teal-src/util/pposix.d.tl b/teal-src/prosody/util/pposix.d.tl
similarity index 100%
rename from teal-src/util/pposix.d.tl
rename to teal-src/prosody/util/pposix.d.tl
diff --git a/teal-src/util/promise.d.tl b/teal-src/prosody/util/promise.d.tl
similarity index 100%
rename from teal-src/util/promise.d.tl
rename to teal-src/prosody/util/promise.d.tl
diff --git a/teal-src/util/queue.d.tl b/teal-src/prosody/util/queue.d.tl
similarity index 100%
rename from teal-src/util/queue.d.tl
rename to teal-src/prosody/util/queue.d.tl
diff --git a/teal-src/util/random.d.tl b/teal-src/prosody/util/random.d.tl
similarity index 100%
rename from teal-src/util/random.d.tl
rename to teal-src/prosody/util/random.d.tl
diff --git a/teal-src/util/ringbuffer.d.tl b/teal-src/prosody/util/ringbuffer.d.tl
similarity index 100%
rename from teal-src/util/ringbuffer.d.tl
rename to teal-src/prosody/util/ringbuffer.d.tl
diff --git a/teal-src/util/roles.d.tl b/teal-src/prosody/util/roles.d.tl
similarity index 100%
rename from teal-src/util/roles.d.tl
rename to teal-src/prosody/util/roles.d.tl
diff --git a/teal-src/util/serialization.d.tl b/teal-src/prosody/util/serialization.d.tl
similarity index 100%
rename from teal-src/util/serialization.d.tl
rename to teal-src/prosody/util/serialization.d.tl
diff --git a/teal-src/util/set.d.tl b/teal-src/prosody/util/set.d.tl
similarity index 100%
rename from teal-src/util/set.d.tl
rename to teal-src/prosody/util/set.d.tl
diff --git a/teal-src/util/signal.d.tl b/teal-src/prosody/util/signal.d.tl
similarity index 100%
rename from teal-src/util/signal.d.tl
rename to teal-src/prosody/util/signal.d.tl
diff --git a/teal-src/util/smqueue.tl b/teal-src/prosody/util/smqueue.tl
similarity index 98%
rename from teal-src/util/smqueue.tl
rename to teal-src/prosody/util/smqueue.tl
index e149dde70..821aee575 100644
--- a/teal-src/util/smqueue.tl
+++ b/teal-src/prosody/util/smqueue.tl
@@ -1,4 +1,4 @@
-local queue = require "util.queue";
+local queue = require "prosody.util.queue";
 
 local record lib
 	-- T would typically be util.stanza
diff --git a/teal-src/util/stanza.d.tl b/teal-src/prosody/util/stanza.d.tl
similarity index 100%
rename from teal-src/util/stanza.d.tl
rename to teal-src/prosody/util/stanza.d.tl
diff --git a/teal-src/util/strbitop.d.tl b/teal-src/prosody/util/strbitop.d.tl
similarity index 100%
rename from teal-src/util/strbitop.d.tl
rename to teal-src/prosody/util/strbitop.d.tl
diff --git a/teal-src/util/struct.d.tl b/teal-src/prosody/util/struct.d.tl
similarity index 100%
rename from teal-src/util/struct.d.tl
rename to teal-src/prosody/util/struct.d.tl
diff --git a/teal-src/util/table.d.tl b/teal-src/prosody/util/table.d.tl
similarity index 100%
rename from teal-src/util/table.d.tl
rename to teal-src/prosody/util/table.d.tl
diff --git a/teal-src/util/termcolours.d.tl b/teal-src/prosody/util/termcolours.d.tl
similarity index 100%
rename from teal-src/util/termcolours.d.tl
rename to teal-src/prosody/util/termcolours.d.tl
diff --git a/teal-src/util/time.d.tl b/teal-src/prosody/util/time.d.tl
similarity index 100%
rename from teal-src/util/time.d.tl
rename to teal-src/prosody/util/time.d.tl
diff --git a/teal-src/util/timer.d.tl b/teal-src/prosody/util/timer.d.tl
similarity index 100%
rename from teal-src/util/timer.d.tl
rename to teal-src/prosody/util/timer.d.tl
diff --git a/teal-src/util/uuid.d.tl b/teal-src/prosody/util/uuid.d.tl
similarity index 100%
rename from teal-src/util/uuid.d.tl
rename to teal-src/prosody/util/uuid.d.tl
diff --git a/teal-src/util/xtemplate.tl b/teal-src/prosody/util/xtemplate.tl
similarity index 98%
rename from teal-src/util/xtemplate.tl
rename to teal-src/prosody/util/xtemplate.tl
index b3bdc400a..7f3b513a3 100644
--- a/teal-src/util/xtemplate.tl
+++ b/teal-src/prosody/util/xtemplate.tl
@@ -14,7 +14,7 @@ local s_match = string.match;
 local s_sub = string.sub;
 local t_concat = table.concat;
 
-local st = require "util.stanza";
+local st = require "prosody.util.stanza";
 
 local type escape_t = function (string) : string
 local type filter_t = function (string, string | st.stanza_t, string) : string | st.stanza_t, boolean