Refactoring of classes and improved convention for classes.