Structure reorganized