Reorganize fish config