Clean up organization of conf files.