Update to new module format
Update to new module format.