diff --git a/lib_xua/src/core/usb_buffer/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc
similarity index 100%
rename from lib_xua/src/core/usb_buffer/decouple.xc
rename to lib_xua/src/core/buffer/decouple/decouple.xc
diff --git a/lib_xua/src/core/usb_buffer/decouple_interrupt.c b/lib_xua/src/core/buffer/decouple/decouple_interrupt.c
similarity index 77%
rename from lib_xua/src/core/usb_buffer/decouple_interrupt.c
rename to lib_xua/src/core/buffer/decouple/decouple_interrupt.c
index 79bfeefe..eb75fc13 100644
--- a/lib_xua/src/core/usb_buffer/decouple_interrupt.c
+++ b/lib_xua/src/core/buffer/decouple/decouple_interrupt.c
@@ -1,5 +1,5 @@
 #ifndef NO_USB
-#include <interrupt.h>
+#include "interrupt.h"
 
 register_interrupt_handler(handle_audio_request, 1, 200)
 #endif
diff --git a/lib_xua/src/core/usb_buffer/get_adc_counts.c b/lib_xua/src/core/buffer/decouple/get_adc_counts.c
similarity index 100%
rename from lib_xua/src/core/usb_buffer/get_adc_counts.c
rename to lib_xua/src/core/buffer/decouple/get_adc_counts.c
diff --git a/lib_xua/src/core/usb_buffer/interrupt.h b/lib_xua/src/core/buffer/decouple/interrupt.h
similarity index 100%
rename from lib_xua/src/core/usb_buffer/interrupt.h
rename to lib_xua/src/core/buffer/decouple/interrupt.h
diff --git a/lib_xua/src/core/usb_buffer/usb_buffer.xc b/lib_xua/src/core/buffer/ep/ep_buffer.xc
similarity index 100%
rename from lib_xua/src/core/usb_buffer/usb_buffer.xc
rename to lib_xua/src/core/buffer/ep/ep_buffer.xc
diff --git a/lib_xua/src/core/usb_buffer/testct_byref.h b/lib_xua/src/core/buffer/ep/testct_byref.h
similarity index 100%
rename from lib_xua/src/core/usb_buffer/testct_byref.h
rename to lib_xua/src/core/buffer/ep/testct_byref.h
diff --git a/lib_xua/src/core/usb_buffer/testct_byref.xc b/lib_xua/src/core/buffer/ep/testct_byref.xc
similarity index 100%
rename from lib_xua/src/core/usb_buffer/testct_byref.xc
rename to lib_xua/src/core/buffer/ep/testct_byref.xc
diff --git a/lib_xua/src/core/usb_buffer/xc_ptr.h b/lib_xua/src/core/xc_ptr.h
similarity index 100%
rename from lib_xua/src/core/usb_buffer/xc_ptr.h
rename to lib_xua/src/core/xc_ptr.h
diff --git a/lib_xua/src/core/usb_buffer/xc_ptr.xc b/lib_xua/src/core/xc_ptr.xc
similarity index 100%
rename from lib_xua/src/core/usb_buffer/xc_ptr.xc
rename to lib_xua/src/core/xc_ptr.xc