REF: Fixes for build, restructure AIOUSB_CTR