Changed organisation of window classes to make it easier to tell what is a descendant of what