Reorganize handlers and config files.