Refactoring of graphics module.