diff --git a/examples/app_xua_simple/src/customdefines.h b/examples/app_xua_simple/src/customdefines.h
index 7553fdcb..6b6c7ff8 100644
--- a/examples/app_xua_simple/src/customdefines.h
+++ b/examples/app_xua_simple/src/customdefines.h
@@ -5,33 +5,8 @@
 #ifndef __custom_defines_h__
 #define __custom_defines_h__
 
-#define NUM_USB_CHAN_OUT 2
-#define NUM_USB_CHAN_IN 2
-#define I2S_CHANS_DAC 2
-#define I2S_CHANS_ADC 2
-#define EXCLUDE_USB_AUDIO_MAIN
-#define NUM_PDM_MICS 0
-#define XUD_TILE 1
-#define AUDIO_IO_TILE 0
-#define MIXER 0
-#define MCLK_441 (512 * 44100)
-#define MCLK_48 (512 * 48000)
-#define MIN_FREQ 48000
-#define MAX_FREQ 48000
-#define SPDIF_TX_INDEX 0
-#define VENDOR_STR "XMOS"
-#define VENDOR_ID 0x20B1
-#define PRODUCT_STR_A2 "XUA Example"
-#define PRODUCT_STR_A1 "XUA Example"
-#define PID_AUDIO_1 1
-#define PID_AUDIO_2 2
-#define AUDIO_CLASS 2
-#define AUDIO_CLASS_FALLBACK 0
-#define BCD_DEVICE 0x1234
-#define XUA_DFU_EN 0
 
-/* TODO */
-#define XUA_DFU XUA_DFU_EN
+
 
 #endif // __custom_defines_h__
 
diff --git a/examples/app_xua_simple/src/xua_conf.h b/examples/app_xua_simple/src/xua_conf.h
new file mode 100644
index 00000000..a2d078c7
--- /dev/null
+++ b/examples/app_xua_simple/src/xua_conf.h
@@ -0,0 +1,30 @@
+
+#define NUM_USB_CHAN_OUT 2
+#define NUM_USB_CHAN_IN 2
+#define I2S_CHANS_DAC 2
+#define I2S_CHANS_ADC 2
+#define MCLK_441 (512 * 44100)
+#define MCLK_48 (512 * 48000)
+#define MIN_FREQ 48000
+#define MAX_FREQ 48000
+
+#define EXCLUDE_USB_AUDIO_MAIN
+#define NUM_PDM_MICS 0
+#define XUD_TILE 1
+#define AUDIO_IO_TILE 0
+#define MIXER 0
+
+#define SPDIF_TX_INDEX 0
+#define VENDOR_STR "XMOS"
+#define VENDOR_ID 0x20B1
+#define PRODUCT_STR_A2 "XUA Example"
+#define PRODUCT_STR_A1 "XUA Example"
+#define PID_AUDIO_1 1
+#define PID_AUDIO_2 2
+#define AUDIO_CLASS 2
+#define AUDIO_CLASS_FALLBACK 0
+#define BCD_DEVICE 0x1234
+#define XUA_DFU_EN 0
+
+/* TODO */
+#define XUA_DFU XUA_DFU_EN
diff --git a/examples/app_xua_simple/src/xud_conf.h b/examples/app_xua_simple/src/xud_conf.h
new file mode 100644
index 00000000..4a7a99ac
--- /dev/null
+++ b/examples/app_xua_simple/src/xud_conf.h
@@ -0,0 +1,6 @@
+
+#include "xua_conf.h"
+
+/* TODO */
+#define XUD_UAC_NUM_USB_CHAN_OUT    NUM_USB_CHAN_OUT
+#define XUD_UAC_NUM_USB_CHAN_IN     NUM_USB_CHAN_IN
diff --git a/lib_xua/api/xua.h b/lib_xua/api/xua.h
index e1dfdfe5..dfb7cc1e 100644
--- a/lib_xua/api/xua.h
+++ b/lib_xua/api/xua.h
@@ -2,6 +2,12 @@
 #ifndef __XUA_H__
 #define __XUA_H__
 
+#ifdef __xua_conf_h_exists__
+    #include "xua_conf.h"
+#endif
+
+#include "xua_conf_default.h"
+
 #include "xua_audiohub.h"
 
 #include "xua_endpoint0.h"
diff --git a/lib_xua/api/xua_audiohub.h b/lib_xua/api/xua_audiohub.h
index 0f1a9ef0..5e452c01 100644
--- a/lib_xua/api/xua_audiohub.h
+++ b/lib_xua/api/xua_audiohub.h
@@ -62,4 +62,11 @@ void AudioHwConfig(unsigned samFreq, unsigned mClk, unsigned dsdMode,
 
 #endif // __XC__
 
+void UserBufferManagementInit(CLIENT_INTERFACE(audManage_if, i_audMan));
+
+void UserBufferManagement(unsigned sampsFromUsbToAudio[],
+                          unsigned sampsFromAudioToUsb[],
+                          CLIENT_INTERFACE(audManage_if, i_audMan));
+
+
 #endif // __XUA_AUDIOHUB_H__
diff --git a/lib_xua/src/usb_audio/devicedefines.h b/lib_xua/api/xua_conf_default.h
similarity index 99%
rename from lib_xua/src/usb_audio/devicedefines.h
rename to lib_xua/api/xua_conf_default.h
index f9dee963..9aadb2dd 100644
--- a/lib_xua/src/usb_audio/devicedefines.h
+++ b/lib_xua/api/xua_conf_default.h
@@ -1,12 +1,12 @@
 /*
- * @brief       Defines relating to device configuration and customisation.
+ * @brief       Defines relating to device configuration and customisation of lib_xua
  * @author      Ross Owen, XMOS Limited
  */
+#ifndef __XUA_CONF_H__
+#define __XUA_CONF_H__
+
 
-#ifndef _DEVICEDEFINES_H_
-#define _DEVICEDEFINES_H_
 
-#include "customdefines.h"
 
 /* Default tile arrangement */
 
diff --git a/lib_xua/api/xua_endpoint0.h b/lib_xua/api/xua_endpoint0.h
index 4f913b1d..ea12b857 100644
--- a/lib_xua/api/xua_endpoint0.h
+++ b/lib_xua/api/xua_endpoint0.h
@@ -1,9 +1,9 @@
 
-#ifndef _ENDPOINT0_H_
-#define _ENDPOINT0_H_
+#ifndef _XUA_ENDPOINT0_H_
+#define _XUA_ENDPOINT0_H_
 
+#include "xua_conf_default.h"
 #include "dfu_interface.h"
-#include "devicedefines.h"
 #include "vendorrequests.h"
 
 /** Function implementing Endpoint 0 for enumeration, control and configuration
diff --git a/lib_xua/src/usb_audio/README.rst b/lib_xua/src/core/README.rst
similarity index 100%
rename from lib_xua/src/usb_audio/README.rst
rename to lib_xua/src/core/README.rst
diff --git a/lib_xua/src/usb_audio/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc
similarity index 99%
rename from lib_xua/src/usb_audio/audiohub/xua_audiohub.xc
rename to lib_xua/src/core/audiohub/xua_audiohub.xc
index 1f1831e3..029f1c10 100755
--- a/lib_xua/src/usb_audio/audiohub/xua_audiohub.xc
+++ b/lib_xua/src/core/audiohub/xua_audiohub.xc
@@ -14,10 +14,11 @@
 #include <xs1_su.h>
 #include <string.h>
 
-#include "devicedefines.h"
+#include "xua_conf_default.h"
+
+#include "devicedefines.h"  /* TODO rm me */
 #include "xua_audiohub.h"
 
-#include "userbuffermanagement.h"
 #include "audioports.h"
 #include "audiohw.h"
 #include "mic_array_conf.h"
diff --git a/lib_xua/src/usb_audio/audiohub/userbuffermanagement.c b/lib_xua/src/core/audiohub/xua_buffman_default.c
similarity index 89%
rename from lib_xua/src/usb_audio/audiohub/userbuffermanagement.c
rename to lib_xua/src/core/audiohub/xua_buffman_default.c
index 384a12d5..390da838 100644
--- a/lib_xua/src/usb_audio/audiohub/userbuffermanagement.c
+++ b/lib_xua/src/core/audiohub/xua_buffman_default.c
@@ -1,6 +1,6 @@
-#include "userbuffermanagement.h"
+
 #include "xccompat.h"
-#include "devicedefines.h"
+#include "xua_audiohub.h"
 
 /* Default implementation for UserBufferManagementInit() */
 void __attribute__ ((weak)) UserBufferManagementInit(CLIENT_INTERFACE(audManage_if, i_audMan))
diff --git a/lib_xua/src/usb_audio/audiohw.h b/lib_xua/src/core/audiohw.h
similarity index 100%
rename from lib_xua/src/usb_audio/audiohw.h
rename to lib_xua/src/core/audiohw.h
diff --git a/lib_xua/src/usb_audio/audiostream/audiostream.c b/lib_xua/src/core/audiostream/audiostream.c
similarity index 100%
rename from lib_xua/src/usb_audio/audiostream/audiostream.c
rename to lib_xua/src/core/audiostream/audiostream.c
diff --git a/lib_xua/src/usb_audio/audiostream/audiostream.h b/lib_xua/src/core/audiostream/audiostream.h
similarity index 100%
rename from lib_xua/src/usb_audio/audiostream/audiostream.h
rename to lib_xua/src/core/audiostream/audiostream.h
diff --git a/lib_xua/src/usb_audio/clocking.h b/lib_xua/src/core/clocking.h
similarity index 100%
rename from lib_xua/src/usb_audio/clocking.h
rename to lib_xua/src/core/clocking.h
diff --git a/lib_xua/src/usb_audio/clocking/clockgen.xc b/lib_xua/src/core/clocking/clockgen.xc
similarity index 100%
rename from lib_xua/src/usb_audio/clocking/clockgen.xc
rename to lib_xua/src/core/clocking/clockgen.xc
diff --git a/lib_xua/src/usb_audio/commands.h b/lib_xua/src/core/commands.h
similarity index 89%
rename from lib_xua/src/usb_audio/commands.h
rename to lib_xua/src/core/commands.h
index e9878125..937492ee 100644
--- a/lib_xua/src/usb_audio/commands.h
+++ b/lib_xua/src/core/commands.h
@@ -1,5 +1,8 @@
 
-#include "devicedefines.h"
+#ifndef __XUA_INTERNAL_CMDS_H__
+#define __XUA_INTERNAL_CMDS_H_
+
+#include "xua_conf_default.h"
 
 /* Clocking commands - c_clk_ctl */
 #define GET_SEL                 0       /* Get value of clock selector */
@@ -28,5 +31,6 @@
 
 #include "dsd_support.h"
 
+#endif
 
 
diff --git a/lib_xua/src/usb_audio/dbtable.h b/lib_xua/src/core/dbtable.h
similarity index 100%
rename from lib_xua/src/usb_audio/dbtable.h
rename to lib_xua/src/core/dbtable.h
diff --git a/lib_xua/src/usb_audio/dsd_support.h b/lib_xua/src/core/dsd_support.h
similarity index 100%
rename from lib_xua/src/usb_audio/dsd_support.h
rename to lib_xua/src/core/dsd_support.h
diff --git a/lib_xua/src/usb_audio/endpoint0/audiorequests.h b/lib_xua/src/core/endpoint0/audiorequests.h
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/audiorequests.h
rename to lib_xua/src/core/endpoint0/audiorequests.h
diff --git a/lib_xua/src/usb_audio/endpoint0/audiorequests.xc b/lib_xua/src/core/endpoint0/audiorequests.xc
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/audiorequests.xc
rename to lib_xua/src/core/endpoint0/audiorequests.xc
diff --git a/lib_xua/src/usb_audio/endpoint0/chanstringgen.py b/lib_xua/src/core/endpoint0/chanstringgen.py
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/chanstringgen.py
rename to lib_xua/src/core/endpoint0/chanstringgen.py
diff --git a/lib_xua/src/usb_audio/endpoint0/chanstrings.h b/lib_xua/src/core/endpoint0/chanstrings.h
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/chanstrings.h
rename to lib_xua/src/core/endpoint0/chanstrings.h
diff --git a/lib_xua/src/usb_audio/endpoint0/dbcalc.h b/lib_xua/src/core/endpoint0/dbcalc.h
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/dbcalc.h
rename to lib_xua/src/core/endpoint0/dbcalc.h
diff --git a/lib_xua/src/usb_audio/endpoint0/dbcalc.xc b/lib_xua/src/core/endpoint0/dbcalc.xc
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/dbcalc.xc
rename to lib_xua/src/core/endpoint0/dbcalc.xc
diff --git a/lib_xua/src/usb_audio/endpoint0/descriptor_defs.h b/lib_xua/src/core/endpoint0/descriptor_defs.h
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/descriptor_defs.h
rename to lib_xua/src/core/endpoint0/descriptor_defs.h
diff --git a/lib_xua/src/usb_audio/endpoint0/descriptors_2.rst b/lib_xua/src/core/endpoint0/descriptors_2.rst
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/descriptors_2.rst
rename to lib_xua/src/core/endpoint0/descriptors_2.rst
diff --git a/lib_xua/src/usb_audio/endpoint0/vendorrequests.c b/lib_xua/src/core/endpoint0/vendorrequests.c
similarity index 100%
rename from lib_xua/src/usb_audio/endpoint0/vendorrequests.c
rename to lib_xua/src/core/endpoint0/vendorrequests.c
diff --git a/lib_xua/src/usb_audio/endpoint0/vendorrequests.h b/lib_xua/src/core/endpoint0/vendorrequests.h
similarity index 97%
rename from lib_xua/src/usb_audio/endpoint0/vendorrequests.h
rename to lib_xua/src/core/endpoint0/vendorrequests.h
index 740c8183..43ffbf91 100644
--- a/lib_xua/src/usb_audio/endpoint0/vendorrequests.h
+++ b/lib_xua/src/core/endpoint0/vendorrequests.h
@@ -2,7 +2,7 @@
 #define _VENDORREQUESTS_H_
 
 #include <xccompat.h>
-#include "devicedefines.h"
+#include "xua_conf_default.h"
 #include "xud_device.h"
 
 /* Functions that handle vustomer vendor requests.
diff --git a/lib_xua/src/usb_audio/endpoint0/endpoint0.c b/lib_xua/src/core/endpoint0/xua_endpoint0.c
similarity index 99%
rename from lib_xua/src/usb_audio/endpoint0/endpoint0.c
rename to lib_xua/src/core/endpoint0/xua_endpoint0.c
index 286b515d..cb07164d 100755
--- a/lib_xua/src/usb_audio/endpoint0/endpoint0.c
+++ b/lib_xua/src/core/endpoint0/xua_endpoint0.c
@@ -7,16 +7,16 @@
 #include <safestring.h>
 #include <stddef.h>
 
+#include "xua_conf_default.h"
+
 #ifndef NO_USB
 #include "xud_device.h"          /* Standard descriptor requests */
 #include "usbaudio20.h"          /* Defines from USB Audio 2.0 spec */
-#include "devicedefines.h"
-#include "descriptors.h"         /* This devices descriptors */
+#include "xua_ep0_descriptors.h"         /* This devices descriptors */
 #include "commands.h"
 #include "audiostream.h"
 #include "hostactive.h"
 #include "vendorrequests.h"
-//#include "dfu_types.h"
 #include "xc_ptr.h"
 #include "audiorequests.h"
 #ifdef HID_CONTROLS
diff --git a/lib_xua/src/usb_audio/flashlib_user.c b/lib_xua/src/core/flashlib_user.c
similarity index 99%
rename from lib_xua/src/usb_audio/flashlib_user.c
rename to lib_xua/src/core/flashlib_user.c
index 03b03b86..e5bed8a1 100644
--- a/lib_xua/src/usb_audio/flashlib_user.c
+++ b/lib_xua/src/core/flashlib_user.c
@@ -1,4 +1,4 @@
-#include "devicedefines.h"
+#include "xua.h"
 #if (XUD_DFU == 1)
 #include "uac_hwresources.h"
 #include <xs1.h>
diff --git a/lib_xua/src/usb_audio/hostactive/hostactive.c b/lib_xua/src/core/hostactive/hostactive.c
similarity index 100%
rename from lib_xua/src/usb_audio/hostactive/hostactive.c
rename to lib_xua/src/core/hostactive/hostactive.c
diff --git a/lib_xua/src/usb_audio/hostactive/hostactive.h b/lib_xua/src/core/hostactive/hostactive.h
similarity index 100%
rename from lib_xua/src/usb_audio/hostactive/hostactive.h
rename to lib_xua/src/core/hostactive/hostactive.h
diff --git a/lib_xua/src/usb_audio/locks/lock.h b/lib_xua/src/core/locks/lock.h
similarity index 100%
rename from lib_xua/src/usb_audio/locks/lock.h
rename to lib_xua/src/core/locks/lock.h
diff --git a/lib_xua/src/usb_audio/main.xc b/lib_xua/src/core/main.xc
similarity index 100%
rename from lib_xua/src/usb_audio/main.xc
rename to lib_xua/src/core/main.xc
diff --git a/lib_xua/src/usb_audio/mixer/mixer.h b/lib_xua/src/core/mixer/mixer.h
similarity index 100%
rename from lib_xua/src/usb_audio/mixer/mixer.h
rename to lib_xua/src/core/mixer/mixer.h
diff --git a/lib_xua/src/usb_audio/mixer/mixer.xc b/lib_xua/src/core/mixer/mixer.xc
similarity index 100%
rename from lib_xua/src/usb_audio/mixer/mixer.xc
rename to lib_xua/src/core/mixer/mixer.xc
diff --git a/lib_xua/src/usb_audio/mixer/repeat.h b/lib_xua/src/core/mixer/repeat.h
similarity index 100%
rename from lib_xua/src/usb_audio/mixer/repeat.h
rename to lib_xua/src/core/mixer/repeat.h
diff --git a/lib_xua/src/usb_audio/module_build_info b/lib_xua/src/core/module_build_info
similarity index 100%
rename from lib_xua/src/usb_audio/module_build_info
rename to lib_xua/src/core/module_build_info
diff --git a/lib_xua/src/usb_audio/module_description b/lib_xua/src/core/module_description
similarity index 100%
rename from lib_xua/src/usb_audio/module_description
rename to lib_xua/src/core/module_description
diff --git a/lib_xua/src/usb_audio/pdm_mics/mic_array_conf.h b/lib_xua/src/core/pdm_mics/mic_array_conf.h
similarity index 100%
rename from lib_xua/src/usb_audio/pdm_mics/mic_array_conf.h
rename to lib_xua/src/core/pdm_mics/mic_array_conf.h
diff --git a/lib_xua/src/usb_audio/pdm_mics/pdm_mic.xc b/lib_xua/src/core/pdm_mics/pdm_mic.xc
similarity index 100%
rename from lib_xua/src/usb_audio/pdm_mics/pdm_mic.xc
rename to lib_xua/src/core/pdm_mics/pdm_mic.xc
diff --git a/lib_xua/src/usb_audio/pdm_mics/pdm_mic_user.c b/lib_xua/src/core/pdm_mics/pdm_mic_user.c
similarity index 92%
rename from lib_xua/src/usb_audio/pdm_mics/pdm_mic_user.c
rename to lib_xua/src/core/pdm_mics/pdm_mic_user.c
index 5d4106b6..3ec864e7 100644
--- a/lib_xua/src/usb_audio/pdm_mics/pdm_mic_user.c
+++ b/lib_xua/src/core/pdm_mics/pdm_mic_user.c
@@ -1,5 +1,5 @@
 
-#include "devicedefines.h"
+#include "xua_conf_default.h""
 
 #if (NUM_PDM_MICS > 0) && !defined(MIC_PROCESSING_USE_INTERFACE)
 
diff --git a/lib_xua/src/usb_audio/pdm_mics/xua_pdm_mic.h b/lib_xua/src/core/pdm_mics/xua_pdm_mic.h
similarity index 100%
rename from lib_xua/src/usb_audio/pdm_mics/xua_pdm_mic.h
rename to lib_xua/src/core/pdm_mics/xua_pdm_mic.h
diff --git a/lib_xua/src/usb_audio/pll/pll.h b/lib_xua/src/core/pll/pll.h
similarity index 100%
rename from lib_xua/src/usb_audio/pll/pll.h
rename to lib_xua/src/core/pll/pll.h
diff --git a/lib_xua/src/usb_audio/ports/audioports.c b/lib_xua/src/core/ports/audioports.c
similarity index 96%
rename from lib_xua/src/usb_audio/ports/audioports.c
rename to lib_xua/src/core/ports/audioports.c
index ddd1fd3e..173f28b3 100644
--- a/lib_xua/src/usb_audio/ports/audioports.c
+++ b/lib_xua/src/core/ports/audioports.c
@@ -3,8 +3,9 @@
 #define __ASSEMBLER__ // Work around for bug #14118
 #include <platform.h>
 #undef __ASSEMBLER__
-#include "devicedefines.h"
 #include "audioports.h"
+#include <xccompat.h>
+#include "xua_conf_default.h"
 
 /* Note since DSD ports could be reused for I2S ports we do all the setup manually in C */
 #if DSD_CHANS_DAC > 0
@@ -58,3 +59,4 @@ unsigned int divide, unsigned curSamFreq, unsigned int dsdMode)
                 p_bclk,
                 divide, curSamFreq);
 }
+
diff --git a/lib_xua/src/usb_audio/ports/audioports.h b/lib_xua/src/core/ports/audioports.h
similarity index 98%
rename from lib_xua/src/usb_audio/ports/audioports.h
rename to lib_xua/src/core/ports/audioports.h
index 5bbc4b28..740b0063 100644
--- a/lib_xua/src/usb_audio/ports/audioports.h
+++ b/lib_xua/src/core/ports/audioports.h
@@ -2,7 +2,7 @@
 #define _AUDIOPORTS_H_
 
 #include <xccompat.h>
-#include "devicedefines.h"
+#include "xua_conf_default.h"
 
 #ifdef __XC__
 void ConfigAudioPorts(
diff --git a/lib_xua/src/usb_audio/ports/audioports.xc b/lib_xua/src/core/ports/audioports.xc
similarity index 99%
rename from lib_xua/src/usb_audio/ports/audioports.xc
rename to lib_xua/src/core/ports/audioports.xc
index 3786ae8b..44ab5c66 100644
--- a/lib_xua/src/usb_audio/ports/audioports.xc
+++ b/lib_xua/src/core/ports/audioports.xc
@@ -1,9 +1,11 @@
 #include <xs1.h>
 #include <platform.h>
 #include <print.h>
-#include "devicedefines.h"
+#include "xua_conf_default.h"
 #include "audioports.h"
 
+
+
 extern port p_mclk_in;
 extern clock    clk_audio_mclk;
 extern clock    clk_audio_bclk;
diff --git a/lib_xua/src/usb_audio/powersave/archU_powerSaving.h b/lib_xua/src/core/powersave/archU_powerSaving.h
similarity index 100%
rename from lib_xua/src/usb_audio/powersave/archU_powerSaving.h
rename to lib_xua/src/core/powersave/archU_powerSaving.h
diff --git a/lib_xua/src/usb_audio/powersave/archU_powerSaving.xc b/lib_xua/src/core/powersave/archU_powerSaving.xc
similarity index 100%
rename from lib_xua/src/usb_audio/powersave/archU_powerSaving.xc
rename to lib_xua/src/core/powersave/archU_powerSaving.xc
diff --git a/lib_xua/src/usb_audio/support/reboot.xc b/lib_xua/src/core/support/reboot.xc
similarity index 100%
rename from lib_xua/src/usb_audio/support/reboot.xc
rename to lib_xua/src/core/support/reboot.xc
diff --git a/lib_xua/src/usb_audio/uac_hwresources.h b/lib_xua/src/core/uac_hwresources.h
similarity index 100%
rename from lib_xua/src/usb_audio/uac_hwresources.h
rename to lib_xua/src/core/uac_hwresources.h
diff --git a/lib_xua/src/usb_audio/usb_buffer/decouple.xc b/lib_xua/src/core/usb_buffer/decouple.xc
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/decouple.xc
rename to lib_xua/src/core/usb_buffer/decouple.xc
diff --git a/lib_xua/src/usb_audio/usb_buffer/decouple_interrupt.c b/lib_xua/src/core/usb_buffer/decouple_interrupt.c
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/decouple_interrupt.c
rename to lib_xua/src/core/usb_buffer/decouple_interrupt.c
diff --git a/lib_xua/src/usb_audio/usb_buffer/get_adc_counts.c b/lib_xua/src/core/usb_buffer/get_adc_counts.c
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/get_adc_counts.c
rename to lib_xua/src/core/usb_buffer/get_adc_counts.c
diff --git a/lib_xua/src/usb_audio/usb_buffer/interrupt.h b/lib_xua/src/core/usb_buffer/interrupt.h
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/interrupt.h
rename to lib_xua/src/core/usb_buffer/interrupt.h
diff --git a/lib_xua/src/usb_audio/usb_buffer/testct_byref.h b/lib_xua/src/core/usb_buffer/testct_byref.h
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/testct_byref.h
rename to lib_xua/src/core/usb_buffer/testct_byref.h
diff --git a/lib_xua/src/usb_audio/usb_buffer/testct_byref.xc b/lib_xua/src/core/usb_buffer/testct_byref.xc
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/testct_byref.xc
rename to lib_xua/src/core/usb_buffer/testct_byref.xc
diff --git a/lib_xua/src/usb_audio/usb_buffer/usb_buffer.h b/lib_xua/src/core/usb_buffer/usb_buffer.h
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/usb_buffer.h
rename to lib_xua/src/core/usb_buffer/usb_buffer.h
diff --git a/lib_xua/src/usb_audio/usb_buffer/usb_buffer.xc b/lib_xua/src/core/usb_buffer/usb_buffer.xc
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/usb_buffer.xc
rename to lib_xua/src/core/usb_buffer/usb_buffer.xc
diff --git a/lib_xua/src/usb_audio/usb_buffer/xc_ptr.h b/lib_xua/src/core/usb_buffer/xc_ptr.h
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/xc_ptr.h
rename to lib_xua/src/core/usb_buffer/xc_ptr.h
diff --git a/lib_xua/src/usb_audio/usb_buffer/xc_ptr.xc b/lib_xua/src/core/usb_buffer/xc_ptr.xc
similarity index 100%
rename from lib_xua/src/usb_audio/usb_buffer/xc_ptr.xc
rename to lib_xua/src/core/usb_buffer/xc_ptr.xc
diff --git a/lib_xua/src/usb_audio/user_hid.h b/lib_xua/src/core/user_hid.h
similarity index 100%
rename from lib_xua/src/usb_audio/user_hid.h
rename to lib_xua/src/core/user_hid.h
diff --git a/lib_xua/src/usb_audio/warnings.xc b/lib_xua/src/core/warnings.xc
similarity index 100%
rename from lib_xua/src/usb_audio/warnings.xc
rename to lib_xua/src/core/warnings.xc
diff --git a/lib_xua/src/usb_audio/endpoint0/descriptors.h b/lib_xua/src/core/xua_ep0_descriptors.h
similarity index 99%
rename from lib_xua/src/usb_audio/endpoint0/descriptors.h
rename to lib_xua/src/core/xua_ep0_descriptors.h
index 84fa60b8..a9bce0ed 100644
--- a/lib_xua/src/usb_audio/endpoint0/descriptors.h
+++ b/lib_xua/src/core/xua_ep0_descriptors.h
@@ -8,7 +8,7 @@
 #define _DEVICE_DESCRIPTORS_
 
 #include <stddef.h>
-#include "devicedefines.h"             /* Device specific define */
+#include "xua_conf_default.h"             /* Device specific define */
 #include "descriptor_defs.h"
 #include "usbaudio20.h"                /* Defines from the USB Audio 2.0 Specifications */
 #include "usbaudiocommon.h"
diff --git a/lib_xua/src/usb_audio/xuduser/xuduser.c b/lib_xua/src/core/xuduser/xuduser.c
similarity index 93%
rename from lib_xua/src/usb_audio/xuduser/xuduser.c
rename to lib_xua/src/core/xuduser/xuduser.c
index 5c698e00..bde2aa96 100644
--- a/lib_xua/src/usb_audio/xuduser/xuduser.c
+++ b/lib_xua/src/core/xuduser/xuduser.c
@@ -1,5 +1,5 @@
 #ifndef NO_USB
-#include "devicedefines.h"
+#include "xua_conf_default.h"
 #include "hostactive.h"
 #include "audiostream.h"
 
diff --git a/lib_xua/src/usb_dfu/dfu.h b/lib_xua/src/dfu/dfu.h
similarity index 100%
rename from lib_xua/src/usb_dfu/dfu.h
rename to lib_xua/src/dfu/dfu.h
diff --git a/lib_xua/src/usb_dfu/dfu.xc b/lib_xua/src/dfu/dfu.xc
similarity index 100%
rename from lib_xua/src/usb_dfu/dfu.xc
rename to lib_xua/src/dfu/dfu.xc
diff --git a/lib_xua/src/usb_dfu/dfu_interface.h b/lib_xua/src/dfu/dfu_interface.h
similarity index 100%
rename from lib_xua/src/usb_dfu/dfu_interface.h
rename to lib_xua/src/dfu/dfu_interface.h
diff --git a/lib_xua/src/usb_dfu/dfu_types.h b/lib_xua/src/dfu/dfu_types.h
similarity index 100%
rename from lib_xua/src/usb_dfu/dfu_types.h
rename to lib_xua/src/dfu/dfu_types.h
diff --git a/lib_xua/src/usb_dfu/flash_interface.c b/lib_xua/src/dfu/flash_interface.c
similarity index 98%
rename from lib_xua/src/usb_dfu/flash_interface.c
rename to lib_xua/src/dfu/flash_interface.c
index 9c8c3a73..3ed695fd 100755
--- a/lib_xua/src/usb_dfu/flash_interface.c
+++ b/lib_xua/src/dfu/flash_interface.c
@@ -1,5 +1,3 @@
-#include "devicedefines.h"
-#if (XUA_DFU == 1)
 #include <xs1.h>
 #include <flash.h>
 #include <flashlib.h>
@@ -247,5 +245,4 @@ int flash_cmd_erase_all(void)
     }
     return 0;
 }
-#endif
 
diff --git a/lib_xua/src/usb_dfu/flash_interface.h b/lib_xua/src/dfu/flash_interface.h
similarity index 100%
rename from lib_xua/src/usb_dfu/flash_interface.h
rename to lib_xua/src/dfu/flash_interface.h
diff --git a/lib_xua/src/usb_midi/midi_descriptor.h b/lib_xua/src/midi/midi_descriptor.h
similarity index 100%
rename from lib_xua/src/usb_midi/midi_descriptor.h
rename to lib_xua/src/midi/midi_descriptor.h
diff --git a/lib_xua/src/usb_midi/midiinparse.h b/lib_xua/src/midi/midiinparse.h
similarity index 100%
rename from lib_xua/src/usb_midi/midiinparse.h
rename to lib_xua/src/midi/midiinparse.h
diff --git a/lib_xua/src/usb_midi/midiinparse.xc b/lib_xua/src/midi/midiinparse.xc
similarity index 100%
rename from lib_xua/src/usb_midi/midiinparse.xc
rename to lib_xua/src/midi/midiinparse.xc
diff --git a/lib_xua/src/usb_midi/midioutparse.h b/lib_xua/src/midi/midioutparse.h
similarity index 100%
rename from lib_xua/src/usb_midi/midioutparse.h
rename to lib_xua/src/midi/midioutparse.h
diff --git a/lib_xua/src/usb_midi/midioutparse.xc b/lib_xua/src/midi/midioutparse.xc
similarity index 100%
rename from lib_xua/src/usb_midi/midioutparse.xc
rename to lib_xua/src/midi/midioutparse.xc
diff --git a/lib_xua/src/usb_midi/queue.h b/lib_xua/src/midi/queue.h
similarity index 100%
rename from lib_xua/src/usb_midi/queue.h
rename to lib_xua/src/midi/queue.h
diff --git a/lib_xua/src/usb_midi/queue.xc b/lib_xua/src/midi/queue.xc
similarity index 100%
rename from lib_xua/src/usb_midi/queue.xc
rename to lib_xua/src/midi/queue.xc
diff --git a/lib_xua/src/usb_midi/usb_midi.h b/lib_xua/src/midi/usb_midi.h
similarity index 100%
rename from lib_xua/src/usb_midi/usb_midi.h
rename to lib_xua/src/midi/usb_midi.h
diff --git a/lib_xua/src/usb_midi/usb_midi.xc b/lib_xua/src/midi/usb_midi.xc
similarity index 100%
rename from lib_xua/src/usb_midi/usb_midi.xc
rename to lib_xua/src/midi/usb_midi.xc
diff --git a/lib_xua/src/usb_midi/usb_midi_support.xc b/lib_xua/src/midi/usb_midi_support.xc
similarity index 100%
rename from lib_xua/src/usb_midi/usb_midi_support.xc
rename to lib_xua/src/midi/usb_midi_support.xc
diff --git a/lib_xua/src/usb_audio/audiohub/userbuffermanagement.h b/lib_xua/src/usb_audio/audiohub/userbuffermanagement.h
deleted file mode 100644
index 5f548c6d..00000000
--- a/lib_xua/src/usb_audio/audiohub/userbuffermanagement.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _USERBUFFERMANAGEMENT_H_
-#define _USERBUFFERMANAGEMENT_H_
-
-#include "xua_audiohub.h"
-#include <xccompat.h>
-
-void UserBufferManagementInit(CLIENT_INTERFACE(audManage_if, i_audMan));
-
-void UserBufferManagement(unsigned sampsFromUsbToAudio[],
-                          unsigned sampsFromAudioToUsb[],
-                          CLIENT_INTERFACE(audManage_if, i_audMan));
-
-#endif // _USERBUFFERMANAGEMENT_H_