Changed a little on structure of the classes and appended some classes.