Reorganize module calls