Modularized and restructured