Reorganize module