[fish] reorganize