Restructure and express update