Move Event(Manager|Handler) to main package
Better eventing