Renamed handlers and merged packages.