Some modules structure changes