--- a/plugins/mod_http.lua	Sat Jun 17 17:19:40 2023 +0200
+++ b/plugins/mod_http.lua	Sun Jun 18 16:48:56 2023 +0200
@@ -18,7 +18,7 @@
 local http_util = require "prosody.util.http";
 local normalize_path = http_util.normalize_path;
 local set = require "prosody.util.set";
-local array = require "util.array";
+local array = require "prosody.util.array";
 
 local ip_util = require "prosody.util.ip";
 local new_ip = ip_util.new_ip;

--- a/plugins/mod_mam/mod_mam.lua	Sat Jun 17 17:19:40 2023 +0200
+++ b/plugins/mod_mam/mod_mam.lua	Sun Jun 18 16:48:56 2023 +0200
@@ -37,7 +37,7 @@
 local time_now = require "prosody.util.time".now;
 local m_min = math.min;
 local timestamp, datestamp = import( "util.datetime", "datetime", "date");
-local parse_duration = require "util.human.io".parse_duration;
+local parse_duration = require "prosody.util.human.io".parse_duration;
 local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50);
 local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://jabber.org/protocol/chatstates" });
 

--- a/util/fsm.lua	Sat Jun 17 17:19:40 2023 +0200
+++ b/util/fsm.lua	Sun Jun 18 16:48:56 2023 +0200
@@ -1,4 +1,4 @@
-local events = require "util.events";
+local events = require "prosody.util.events";
 
 local fsm_methods = {};
 local fsm_mt = { __index = fsm_methods };

--- a/util/session.lua	Sat Jun 17 17:19:40 2023 +0200
+++ b/util/session.lua	Sun Jun 18 16:48:56 2023 +0200
@@ -1,5 +1,5 @@
 local initialize_filters = require "prosody.util.filters".initialize;
-local time = require "util.time";
+local time = require "prosody.util.time";
 local logger = require "prosody.util.logger";
 
 local function new_session(typ)

--- a/util/startup.lua	Sat Jun 17 17:19:40 2023 +0200
+++ b/util/startup.lua	Sun Jun 18 16:48:56 2023 +0200
@@ -425,7 +425,7 @@
 function startup.prepare_to_start()
 	log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
 	-- Signal to modules that we are ready to start
-	prosody.started = require "util.promise".new(function (resolve)
+	prosody.started = require "prosody.util.promise".new(function (resolve)
 		prosody.events.add_handler("server-started", function ()
 			resolve();
 		end);
@@ -479,7 +479,7 @@
 end
 
 function startup.notify_started()
-	require "util.timer".add_task(0, function ()
+	require "prosody.util.timer".add_task(0, function ()
 		prosody.log("debug", "Firing server-started event");
 		prosody.events.fire_event("server-started");
 	end);