Moved handler classes to different packages
Revert "Moved handler classes to different packages"

This reverts commit e4446f5b56645ff794e69efd57da102ad374826b.