Restructuring Schema.