Remove the flattening namespace code, use module.