Reorganize fish config and abbreviations