changed structure of module.
changed structure of module.