changed relations between classes
changed inline structure