Reorganize secrets.yml