Rearranged the module structure.