diff --git a/STRUCTURE b/STRUCTURE
index def2b98..83259e4 100644
--- a/STRUCTURE
+++ b/STRUCTURE
@@ -1,6 +1,5 @@
 include platform.cosmic
-core: standard
-desktop: core standard
+desktop: desktop-common
 live: desktop live-common
 ship: boot installer desktop d-i-requirements
 ship-live: boot live
diff --git a/core b/core
deleted file mode 100644
index b763ccf..0000000
--- a/core
+++ /dev/null
@@ -1,53 +0,0 @@
-Task-Per-Derivative: 1
-Task-Section: user
-Task-Description: Lubuntu minimal installation
-Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXQt environment).
-Task-Key: lubuntu-core
-Task-Name: lubuntu-core
-Task-Metapackage: lubuntu-core
-
-= Metapackage =
-
- * lubuntu-core
-
-= Lubuntu core packages =
-
- * lubuntu-default-settings
- * lubuntu-artwork
- * lubuntu-icon-theme
- * plymouth-theme-lubuntu-next-logo
- * plymouth-theme-lubuntu-next-text
-
-= LXQt core packages =
-
- * openbox
- * pcmanfm-qt
- * lxqt-core
- * qterminal
-
- * libqt5svg5                       # Force svg support for Qt
- * oxygen-icon-theme                # Default LXQt settings need it
-
-= Display manager =
-
- * sddm
- * sddm-theme-lubuntu-chooser
- * !sddm-theme-breeze # Don't install this, we don't need it and it causes problems on install.
-
-= X =
-
- * xserver-xorg-video-all           # Depend on the driver-all packages, xorg doesn't provide them
- * xserver-xorg-input-all           # and desktop-common seed only recommend them. LP: #1441843
- * xserver-xorg-input-synaptics     # x-x-input-all only Recommends; LP: #1667128
- * xserver-xorg-video-intel         # Not installed by default, better for old Intel cards
- * xserver-xorg-video-qxl           # Hi resolution support on virtual environments
-
-= Other needed packages =
-
- * dbus-x11
- * ubuntu-mono                      # Minimal artwork bits, seed him with lubuntu-artwork to
-                                    # avoid other icon theme to be installed.
- * !adwaita-icon-theme              # Exclude adwaita-icon-theme because it's already provided
-                                    # by lubuntu-icon-theme
-
- * (ubuntu-report)                  # Allow analytic reporting
diff --git a/desktop b/desktop
index 3a2d8b2..7626e09 100644
--- a/desktop
+++ b/desktop
@@ -2,18 +2,47 @@ Task-Per-Derivative: 1
 Task-Section: user
 Task-Description: Lubuntu Desktop
 Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environment).
+Task-Seeds: desktop-common
 Task-Key: lubuntu-desktop
 Task-Name: lubuntu-desktop
 Task-Metapackage: lubuntu-desktop
 
-== Default seeds ==
-
- * lubuntu-core
-
 == Metapackage ==
 
  * lubuntu-desktop                  # metapackage for everything here
 
+= Lubuntu core packages =
+
+ * lubuntu-default-settings
+ * lubuntu-artwork
+ * lubuntu-icon-theme
+ * plymouth-theme-lubuntu-next-logo
+ * plymouth-theme-lubuntu-next-text
+
+= LXQt core packages =
+
+ * openbox
+ * pcmanfm-qt
+ * lxqt-core
+ * qterminal
+
+ * libqt5svg5                       # Force svg support for Qt
+ * oxygen-icon-theme                # Default LXQt settings need it
+
+= Display manager =
+
+ * sddm
+ * sddm-theme-lubuntu-chooser
+ * !sddm-theme-breeze # Don't install this, we don't need it and it causes problems on install.
+
+= Other needed packages =
+
+ * dbus-x11
+ * ubuntu-mono                      # Minimal artwork bits, seed him with lubuntu-artwork to
+                                    # avoid other icon theme to be installed.
+ * !adwaita-icon-theme              # Exclude adwaita-icon-theme because it's already provided
+                                    # by lubuntu-icon-theme
+
 = Lubuntu =
 
  * qlubuntu-default-session