Refactored the definitive-graphics package