diff --git a/modules/expert_mode.py b/modules/expert_mode.py
index aaa140ed1..2dbc00d05 120000
--- a/modules/expert_mode.py
+++ b/modules/expert_mode.py
@@ -1 +1 @@
-installed/system/expert_mode.py
\ No newline at end of file
+installed/expert_mode/expert_mode.py
\ No newline at end of file
diff --git a/modules/installed/system/expert_mode.py b/modules/installed/expert_mode/expert_mode.py
similarity index 92%
rename from modules/installed/system/expert_mode.py
rename to modules/installed/expert_mode/expert_mode.py
index 041ce0793..19ee30f0d 100644
--- a/modules/installed/system/expert_mode.py
+++ b/modules/installed/expert_mode/expert_mode.py
@@ -24,10 +24,10 @@ class Experts(PagePlugin):
 
     def __init__(self, *args, **kwargs):
         PagePlugin.__init__(self, *args, **kwargs)
-        self.register_page('sys.config.expert')
+        self.register_page('sys.expert')
 
-        cfg.html_root.sys.config.menu.add_item(_('Expert mode'), 'icon-cog',
-                                               '/sys/config/expert', 10)
+        cfg.html_root.sys.menu.add_item(_('Expert Mode'), 'icon-cog',
+                                        '/sys/expert', 10)
 
     @cherrypy.expose
     @require()
diff --git a/modules/installed/system/templates/expert_mode.html b/modules/installed/expert_mode/templates/expert_mode.html
similarity index 100%
rename from modules/installed/system/templates/expert_mode.html
rename to modules/installed/expert_mode/templates/expert_mode.html