Folder names now separate to folder paths