renamed the classes, adding new fire organization