Organized the classes hierachy