re structure modules