Reorganize module loading