Restructuring to give each part its own home