move typedef into class