Module structure modification