move the drawing command classes back to where they were before, since it's no longer required to define them before the drawing classes