Change module hierarchy again.