Re-organizing some functions.
Re-organizing some functions.

platform9/fission,life1347/fission,platform9/fission,life1347/fission,fission/fission,fission/fission,life1347/fission,life1347/fission,life1347/fission,life1347/fission,fission/fission,platform9/fission,life1347/fission,life1347/fission,life1347/fission,fission/fission,platform9/fission