diff --git a/module_usb_aud_shared/README b/module_usb_audio/README
similarity index 100%
rename from module_usb_aud_shared/README
rename to module_usb_audio/README
diff --git a/module_usb_aud_shared/audio.h b/module_usb_audio/audio.h
similarity index 100%
rename from module_usb_aud_shared/audio.h
rename to module_usb_audio/audio.h
diff --git a/module_usb_aud_shared/audio.xc b/module_usb_audio/audio.xc
similarity index 100%
rename from module_usb_aud_shared/audio.xc
rename to module_usb_audio/audio.xc
diff --git a/module_usb_aud_shared/audiostream/audiostream.h b/module_usb_audio/audiostream/audiostream.h
similarity index 100%
rename from module_usb_aud_shared/audiostream/audiostream.h
rename to module_usb_audio/audiostream/audiostream.h
diff --git a/module_usb_aud_shared/clockcmds.h b/module_usb_audio/clockcmds.h
similarity index 100%
rename from module_usb_aud_shared/clockcmds.h
rename to module_usb_audio/clockcmds.h
diff --git a/module_usb_aud_shared/clocking/clockgen.xc b/module_usb_audio/clocking/clockgen.xc
similarity index 100%
rename from module_usb_aud_shared/clocking/clockgen.xc
rename to module_usb_audio/clocking/clockgen.xc
diff --git a/module_usb_aud_shared/clocking/clocking.h b/module_usb_audio/clocking/clocking.h
similarity index 100%
rename from module_usb_aud_shared/clocking/clocking.h
rename to module_usb_audio/clocking/clocking.h
diff --git a/module_usb_aud_shared/codec/codec.h b/module_usb_audio/codec/codec.h
similarity index 100%
rename from module_usb_aud_shared/codec/codec.h
rename to module_usb_audio/codec/codec.h
diff --git a/module_usb_aud_shared/dbtable.h b/module_usb_audio/dbtable.h
similarity index 100%
rename from module_usb_aud_shared/dbtable.h
rename to module_usb_audio/dbtable.h
diff --git a/module_usb_aud_shared/devicedefines.h b/module_usb_audio/devicedefines.h
similarity index 100%
rename from module_usb_aud_shared/devicedefines.h
rename to module_usb_audio/devicedefines.h
diff --git a/module_usb_aud_shared/endpoint0/audiorequests.xc b/module_usb_audio/endpoint0/audiorequests.xc
similarity index 100%
rename from module_usb_aud_shared/endpoint0/audiorequests.xc
rename to module_usb_audio/endpoint0/audiorequests.xc
diff --git a/module_usb_aud_shared/endpoint0/dbcalc.h b/module_usb_audio/endpoint0/dbcalc.h
similarity index 100%
rename from module_usb_aud_shared/endpoint0/dbcalc.h
rename to module_usb_audio/endpoint0/dbcalc.h
diff --git a/module_usb_aud_shared/endpoint0/dbcalc.xc b/module_usb_audio/endpoint0/dbcalc.xc
similarity index 100%
rename from module_usb_aud_shared/endpoint0/dbcalc.xc
rename to module_usb_audio/endpoint0/dbcalc.xc
diff --git a/module_usb_aud_shared/endpoint0/descriptors_2.h b/module_usb_audio/endpoint0/descriptors_2.h
similarity index 100%
rename from module_usb_aud_shared/endpoint0/descriptors_2.h
rename to module_usb_audio/endpoint0/descriptors_2.h
diff --git a/module_usb_aud_shared/endpoint0/descriptors_2.rst b/module_usb_audio/endpoint0/descriptors_2.rst
similarity index 100%
rename from module_usb_aud_shared/endpoint0/descriptors_2.rst
rename to module_usb_audio/endpoint0/descriptors_2.rst
diff --git a/module_usb_aud_shared/endpoint0/endpoint0.h b/module_usb_audio/endpoint0/endpoint0.h
similarity index 100%
rename from module_usb_aud_shared/endpoint0/endpoint0.h
rename to module_usb_audio/endpoint0/endpoint0.h
diff --git a/module_usb_aud_shared/endpoint0/endpoint0.xc b/module_usb_audio/endpoint0/endpoint0.xc
similarity index 100%
rename from module_usb_aud_shared/endpoint0/endpoint0.xc
rename to module_usb_audio/endpoint0/endpoint0.xc
diff --git a/module_usb_aud_shared/endpoint0/vendorrequests.h b/module_usb_audio/endpoint0/vendorrequests.h
similarity index 100%
rename from module_usb_aud_shared/endpoint0/vendorrequests.h
rename to module_usb_audio/endpoint0/vendorrequests.h
diff --git a/module_usb_aud_shared/locks/lock.S b/module_usb_audio/locks/lock.S
similarity index 100%
rename from module_usb_aud_shared/locks/lock.S
rename to module_usb_audio/locks/lock.S
diff --git a/module_usb_aud_shared/locks/lock.h b/module_usb_audio/locks/lock.h
similarity index 100%
rename from module_usb_aud_shared/locks/lock.h
rename to module_usb_audio/locks/lock.h
diff --git a/module_usb_aud_shared/main.xc b/module_usb_audio/main.xc
similarity index 100%
rename from module_usb_aud_shared/main.xc
rename to module_usb_audio/main.xc
diff --git a/module_usb_aud_shared/mixer/fastmix.S b/module_usb_audio/mixer/fastmix.S
similarity index 100%
rename from module_usb_aud_shared/mixer/fastmix.S
rename to module_usb_audio/mixer/fastmix.S
diff --git a/module_usb_aud_shared/mixer/mixer.h b/module_usb_audio/mixer/mixer.h
similarity index 100%
rename from module_usb_aud_shared/mixer/mixer.h
rename to module_usb_audio/mixer/mixer.h
diff --git a/module_usb_aud_shared/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc
similarity index 100%
rename from module_usb_aud_shared/mixer/mixer.xc
rename to module_usb_audio/mixer/mixer.xc
diff --git a/module_usb_aud_shared/mixer/repeat.h b/module_usb_audio/mixer/repeat.h
similarity index 100%
rename from module_usb_aud_shared/mixer/repeat.h
rename to module_usb_audio/mixer/repeat.h
diff --git a/module_usb_aud_shared/module_build_info b/module_usb_audio/module_build_info
similarity index 100%
rename from module_usb_aud_shared/module_build_info
rename to module_usb_audio/module_build_info
diff --git a/module_usb_aud_shared/module_description b/module_usb_audio/module_description
similarity index 100%
rename from module_usb_aud_shared/module_description
rename to module_usb_audio/module_description
diff --git a/module_usb_aud_shared/pll/pll.h b/module_usb_audio/pll/pll.h
similarity index 100%
rename from module_usb_aud_shared/pll/pll.h
rename to module_usb_audio/pll/pll.h
diff --git a/module_usb_aud_shared/ports/audioports.h b/module_usb_audio/ports/audioports.h
similarity index 100%
rename from module_usb_aud_shared/ports/audioports.h
rename to module_usb_audio/ports/audioports.h
diff --git a/module_usb_aud_shared/ports/audioports.xc b/module_usb_audio/ports/audioports.xc
similarity index 100%
rename from module_usb_aud_shared/ports/audioports.xc
rename to module_usb_audio/ports/audioports.xc
diff --git a/module_usb_aud_shared/reboot.xc b/module_usb_audio/reboot.xc
similarity index 100%
rename from module_usb_aud_shared/reboot.xc
rename to module_usb_audio/reboot.xc
diff --git a/module_usb_aud_shared/rebootwrapper.s b/module_usb_audio/rebootwrapper.s
similarity index 100%
rename from module_usb_aud_shared/rebootwrapper.s
rename to module_usb_audio/rebootwrapper.s
diff --git a/module_usb_aud_shared/usb_buffer/decouple.h b/module_usb_audio/usb_buffer/decouple.h
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/decouple.h
rename to module_usb_audio/usb_buffer/decouple.h
diff --git a/module_usb_aud_shared/usb_buffer/decouple.xc b/module_usb_audio/usb_buffer/decouple.xc
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/decouple.xc
rename to module_usb_audio/usb_buffer/decouple.xc
diff --git a/module_usb_aud_shared/usb_buffer/decouple.xc.orig b/module_usb_audio/usb_buffer/decouple.xc.orig
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/decouple.xc.orig
rename to module_usb_audio/usb_buffer/decouple.xc.orig
diff --git a/module_usb_aud_shared/usb_buffer/get_adc_counts.c b/module_usb_audio/usb_buffer/get_adc_counts.c
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/get_adc_counts.c
rename to module_usb_audio/usb_buffer/get_adc_counts.c
diff --git a/module_usb_aud_shared/usb_buffer/interrupt.h b/module_usb_audio/usb_buffer/interrupt.h
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/interrupt.h
rename to module_usb_audio/usb_buffer/interrupt.h
diff --git a/module_usb_aud_shared/usb_buffer/testct_byref.h b/module_usb_audio/usb_buffer/testct_byref.h
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/testct_byref.h
rename to module_usb_audio/usb_buffer/testct_byref.h
diff --git a/module_usb_aud_shared/usb_buffer/testct_byref.xc b/module_usb_audio/usb_buffer/testct_byref.xc
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/testct_byref.xc
rename to module_usb_audio/usb_buffer/testct_byref.xc
diff --git a/module_usb_aud_shared/usb_buffer/usb_buffer.h b/module_usb_audio/usb_buffer/usb_buffer.h
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/usb_buffer.h
rename to module_usb_audio/usb_buffer/usb_buffer.h
diff --git a/module_usb_aud_shared/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/usb_buffer.xc
rename to module_usb_audio/usb_buffer/usb_buffer.xc
diff --git a/module_usb_aud_shared/usb_buffer/xc_ptr.h b/module_usb_audio/usb_buffer/xc_ptr.h
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/xc_ptr.h
rename to module_usb_audio/usb_buffer/xc_ptr.h
diff --git a/module_usb_aud_shared/usb_buffer/xc_ptr.xc b/module_usb_audio/usb_buffer/xc_ptr.xc
similarity index 100%
rename from module_usb_aud_shared/usb_buffer/xc_ptr.xc
rename to module_usb_audio/usb_buffer/xc_ptr.xc
diff --git a/module_usb_aud_shared/write_sswitch_reg_blind.S b/module_usb_audio/write_sswitch_reg_blind.S
similarity index 100%
rename from module_usb_aud_shared/write_sswitch_reg_blind.S
rename to module_usb_audio/write_sswitch_reg_blind.S
diff --git a/module_usb_aud_shared/xuduser/xuduser.xc b/module_usb_audio/xuduser/xuduser.xc
similarity index 100%
rename from module_usb_aud_shared/xuduser/xuduser.xc
rename to module_usb_audio/xuduser/xuduser.xc