Reverted renaming of "Cake" and "Test" folders.