Restructure remove dns. prefix