Refactor Draw and Notifier package structures