Restructure popup files