Move Bluetooth API class after system class instead of at end