restructuring
new classes add and existing classes renamed