diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/deployer/management/ContextDeployer-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/management/ContextDeployer-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/deployer/management/ContextDeployer-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/management/ContextDeployer-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/deployer/management/WebAppDeployer-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/management/WebAppDeployer-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/deployer/management/WebAppDeployer-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/deploy/management/WebAppDeployer-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerContainer-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerContainer-mbean.properties
deleted file mode 100644
index fe404800b74..00000000000
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerContainer-mbean.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-HandlerContainer: Handler of multiple Handlers
-childHandlers: MObject:RO:All contained handlers
\ No newline at end of file
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/ContextHandler-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/ContextHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/ContextHandler-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/ContextHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/ContextHandlerCollection-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/ContextHandlerCollection-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/ContextHandlerCollection-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/ContextHandlerCollection-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerCollection-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/HandlerCollection-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerCollection-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/HandlerCollection-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerWrapper-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/HandlerWrapper-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/HandlerWrapper-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/HandlerWrapper-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/StatisticsHandler-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/StatisticsHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/handler/management/StatisticsHandler-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/handler/management/StatisticsHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/management/AbstractConnector-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/AbstractConnector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/management/AbstractConnector-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/AbstractConnector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/management/Connector-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Connector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/management/Connector-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Connector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/management/Handler-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Handler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/management/Handler-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Handler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/HandlerContainer-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/HandlerContainer-mbean.properties
new file mode 100644
index 00000000000..374e020897e
--- /dev/null
+++ b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/HandlerContainer-mbean.properties
@@ -0,0 +1,3 @@
+HandlerContainer: Handler of multiple Handlers
+handlers: MObject:RO:Handlers in this container
+childHandlers: MObject:RO:All contained handlers
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/management/NCSARequestLog-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/NCSARequestLog-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/management/NCSARequestLog-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/NCSARequestLog-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/management/Server-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Server-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/management/Server-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/management/Server-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/nio/management/SelectChannelConnector-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/management/SelectChannelConnector-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/nio/management/SelectChannelConnector-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/nio/management/SelectChannelConnector-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/AbstractSessionManager-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/server/session/management/AbstractSessionManager-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/AbstractSessionManager-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/server/session/management/AbstractSessionManager-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/Context-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/ServletContextHandler-mbean.properties
similarity index 100%
rename from jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/Context-mbean.properties
rename to jetty-jmx/src/main/resources/org/eclipse/jetty/servlet/management/ServletContextHandler-mbean.properties
diff --git a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/thread/management/BoundedThreadPool-mbean.properties b/jetty-jmx/src/main/resources/org/eclipse/jetty/util/thread/management/BoundedThreadPool-mbean.properties
deleted file mode 100644
index d460d5b47d6..00000000000
--- a/jetty-jmx/src/main/resources/org/eclipse/jetty/util/thread/management/BoundedThreadPool-mbean.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-BoundedThreadPool: A thread pool with fixed bounds
-minThreads: Minimum number of threads in the pool
-maxThreads: Maximum number threads in the pool
-name: Name of the thread pool
-daemon: Are pool threads daemon threads
-threadsPriority: Priority of threads
-maxIdleTimeMs: Maximum time a thread may be idle in ms
\ No newline at end of file