Search Restructure