new structure and some classes was written