Restructure migration