Renamed and redone the init sequence for modules