Reformat as module