Added files information and the naming of the class and sub-classes.