Re-organized handlers package.