Reorganize secrets [ci skip]