started refactoring draw package