diff --git a/lxqt/desktop/desktop.xml b/lxqt/desktop/desktop.xml
index 463418f4a2..58cb1d9f4c 100644
--- a/lxqt/desktop/desktop.xml
+++ b/lxqt/desktop/desktop.xml
@@ -33,36 +33,46 @@
   </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-build-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-menu-data.xml"/>
+<!-- Needed dependency -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="muparser.xml"/>
+<!-- Needed kf5 packages -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwindowsystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-themes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kwayland.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kconfig.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
+<!-- Needed plasma package -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-libkscreen.xml"/>
+<!-- group 0 -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-build-tools.xml"/>
+<!-- group I -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqtxdg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-menu-data.xml"/>
+<!-- group II -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblxqt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsysstat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtxdg-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libfm-qt.xml"/>
+<!-- group III -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-themes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-qtplugin.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obconf-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pavucontrol-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtermwidget.xml"/>
+<!-- group IV -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lximage-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-about.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-admin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-globalkeys.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-notificationd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-policykit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtxdg-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-session.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcmanfm-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-solid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qterminal.xml"/>
+<!-- group V -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kidletime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-powermanagement.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="muparser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-runner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="post-install.xml"/>
-<!--  
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-l10n.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxqt-kguiaddons.xml"/>
--->
 </chapter>
diff --git a/archive/lxqt/apps/lximage-qt.xml b/lxqt/desktop/lximage-qt.xml
similarity index 100%
rename from archive/lxqt/apps/lximage-qt.xml
rename to lxqt/desktop/lximage-qt.xml
diff --git a/archive/lxqt/apps/obconf-qt.xml b/lxqt/desktop/obconf-qt.xml
similarity index 100%
rename from archive/lxqt/apps/obconf-qt.xml
rename to lxqt/desktop/obconf-qt.xml
diff --git a/archive/lxqt/apps/pavucontrol-qt.xml b/lxqt/desktop/pavucontrol-qt.xml
similarity index 100%
rename from archive/lxqt/apps/pavucontrol-qt.xml
rename to lxqt/desktop/pavucontrol-qt.xml
diff --git a/lxqt/apps/qterminal.xml b/lxqt/desktop/qterminal.xml
similarity index 100%
rename from lxqt/apps/qterminal.xml
rename to lxqt/desktop/qterminal.xml
diff --git a/lxqt/apps/qtermwidget.xml b/lxqt/desktop/qtermwidget.xml
similarity index 100%
rename from lxqt/apps/qtermwidget.xml
rename to lxqt/desktop/qtermwidget.xml
diff --git a/lxqt/lxqt.xml b/lxqt/lxqt.xml
index 69a241c936..53b1ed2b94 100644
--- a/lxqt/lxqt.xml
+++ b/lxqt/lxqt.xml
@@ -11,6 +11,9 @@
   <title>LXQt</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop/desktop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
+<!-- with the build order given in
+https://github.com/lxqt/lxqt/wiki/Building-from-source, it is hard to separate between desktop and applications. Using only "desktop" for now
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apps/apps.xml"/>
+-->
 
 </part>