Moved Handler classes to different packages PT. 2.