rework some module placement, add address class
rework some module placement, add address class