Restructure module.