Fix data module placement