Rework system module to be less ugly to maintain.