Moved things into the BT namespace to keep it clean