Refactor graphics classes
Refactor graphics classes