Reorganized the raw module again