restructuring plotting classes