move around more code

Created by  Bowei Liu  on December 24, 2020
JUW5PLQUDZE4A45Y4HJUKQUILMFKFAGAY2XZG4ALTQWLWPX4H4DQC
Change contents