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

This reverts commit 74b10aa6a0ac2760a0a1062bdb3d2457d41a428a.