Reorganize module properties