->Refactoring: restructured the packages to include and event handler package