Refactor task packages, Addition of Event System.