Re-added file doc, moved namespace definition