Move base classes for two graphics commands