Move beacon implementations under beacons