Move some files around to avoid redundant settings.