Move handlers to new handler package.