Brought MoveSittingsToNewFolderStructure over to new dir layout