Changed the package structure
EventScheduler modified