major reorg; add BT for OSX