Fire structure reorganized