Renaming directories to Cake v1.3 convention