Update graphics,
refactor some classes.