iBeacon API refactor complete