Restructure and break out react views