complete rebulid of module structure