Moved radio stuff to own stuct