Reorganize output modules