#3437 Move out obsolete files; refactor markup for search and headers