Restructure and rework