Unflattened files - was a namespace issue