Reorganized structure for deployment