Changed to official module format.