completed view controller restructuring