diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 837e38076c..b6cf1e27ba 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -211,11 +211,6 @@
 # Windowmanager to use (fluxbox / none)
   WINDOWMANAGER="fluxbox"
 
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio"
-
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
 
diff --git a/projects/Generic/filesystem/etc/X11/xorg-i915.conf b/projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf
similarity index 100%
rename from projects/Generic/filesystem/etc/X11/xorg-i915.conf
rename to projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf
diff --git a/projects/Generic/filesystem/usr/bin/intel-fullrange.sh b/projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh
similarity index 100%
rename from projects/Generic/filesystem/usr/bin/intel-fullrange.sh
rename to projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh
diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service b/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
similarity index 100%
rename from projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
rename to projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service b/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service
similarity index 100%
rename from projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service
rename to projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service
diff --git a/projects/Generic/devices/Generic-legacy/options b/projects/Generic/devices/Generic-legacy/options
new file mode 100644
index 0000000000..e4a7104fa6
--- /dev/null
+++ b/projects/Generic/devices/Generic-legacy/options
@@ -0,0 +1,19 @@
+# OpenGL(X) implementation to use (no / mesa)
+  OPENGL="mesa"
+
+# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+  OPENGLES="no"
+
+# Displayserver to use (x11 / no)
+  DISPLAYSERVER="x11"
+
+# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+  KODIPLAYER_DRIVER="default"
+
+# set the addon project
+  ADDON_PROJECT="Generic"
+
+# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
+# Space separated list is supported,
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio"
diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options
new file mode 100644
index 0000000000..4498372421
--- /dev/null
+++ b/projects/Generic/devices/Generic/options
@@ -0,0 +1,19 @@
+# OpenGL(X) implementation to use (no / mesa)
+  OPENGL="no"
+
+# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+  OPENGLES="mesa"
+
+# Displayserver to use (x11 / no)
+  DISPLAYSERVER="no"
+
+# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+  KODIPLAYER_DRIVER="mesa"
+
+# set the addon project
+  ADDON_PROJECT="Generic"
+
+# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
+# Space separated list is supported,
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 vmware virtio"
diff --git a/projects/Generic/options b/projects/Generic/options
index 0dabb88226..dca9b367d2 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -50,18 +50,6 @@
   # build and install ALSA Audio support (yes / no)
     ALSA_SUPPORT="yes"
 
-  # OpenGL(X) implementation to use (no / mesa)
-    OPENGL="mesa"
-
-  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
-    OPENGLES="no"
-
-  # Displayserver to use (x11 / no)
-    DISPLAYSERVER="x11"
-
-  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
-    KODIPLAYER_DRIVER="default"
-
   # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"