diff --git a/projects/intel_x64/linux/linux.x86_64.conf b/projects/intel/linux/linux.x86_64.conf
similarity index 100%
rename from projects/intel_x64/linux/linux.x86_64.conf
rename to projects/intel/linux/linux.x86_64.conf
diff --git a/projects/intel_x64/options b/projects/intel_x64/options
deleted file mode 100644
index 4ffcdc7ff5..0000000000
--- a/projects/intel_x64/options
+++ /dev/null
@@ -1,110 +0,0 @@
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREATING0="#######################################################"
-  GREATING1="# Welcome to OpenELEC - the powerfull Mediacenter4you #"
-  GREATING2="# .......... visit http://www.openelec.tv ........... #"
-  GREATING3="#######################################################"
-  GREATING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# Target system we want to cross compile for (i386/x86_64/powerpc)
-  TARGET_ARCH="x86_64"
-
-# The TARGET_CPU variable controls which processor should be targeted for
-# generated code.
-  case $TARGET_ARCH in
-    i386)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx athlon-mp athlon-xp athlon-4
-      #               athlon-tbird athlon k6-3 k6-2 k6 geode
-      # (Intel CPUs)  core2 nocona prescott pentium4[m] pentium3[m] pentium-m
-      #               pentium2 pentiumpro pentium-mmx pentium
-      #               i686 i586 i486 i386
-      # (VIA CPUs)    c3 c3-2
-      #
-      TARGET_CPU="core2"
-      ;;
-
-    x86_64)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx amdfam10 barcelona
-      # (Intel CPUs)  core2 nocona
-      #
-      TARGET_CPU="core2"
-      ;;
-  esac
-
-# Build optimizations (size/speed)
-  OPTIMIZATIONS="speed"
-
-# Project CFLAGS
-  PROJECT_CFLAGS="-mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse"
-
-# Timezone to use (empty disables timezone support)
-# use a TZ environment string
-  TIMEZONE=""
-
-# Mediacenter to use (xbmc / xbmc-pvr)
-  MEDIACENTER="xbmc-pvr"
-
-# Skins to install (Vision2)
-  SKINS="Vision2"
-
-# Plugins for XBMC to install (SABnzbd)
-# Space separated list is supported,
-# e.g. XBMC_PLUGINS="SABnzbd"
-  XBMC_PLUGINS= #"SABnzbd"
-
-# build with network support (yes / no)
-  NETWORK="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# todo (need for vdr?)
-  SERVICES="yes"
-
-# Displayserver to use (xorg-server / no)
-  DISPLAYSERVER="xorg-server"
-
-# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia)
-# Space separated list is supported, 
-# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nvidia"
-  GRAPHIC_DRIVERS="i965"
-
-# Use internal or external ffmpeg. Internal means included ffmpeg in XBMC,
-# external means seperate ffmpeg library. External ffmpeg is needed for
-# multithreading support and future vaapi support (internal / external)
-  FFMPEG="internal"
-
-# Use VDPAU video acceleration (needs nVidia driver and a supported card)
-  VDPAU="no"
-
-# Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI="yes"
-
-# Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
-# leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
-# atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
-# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
-  REMOTE="mceusb"
-
-# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
-# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
-# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER="mceusb"
-
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
-# Space separated list is supported, 
-# e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="iwl5000"
-
-# build with games support (yes / no)
-  GAMES="no"
-
-# build with emulator support (yes / no)
-  EMULATORS="no"
-
-# Coreboot support (yes / no)
-  COREBOOT="no"