Add AddBasicWash and revert folder name changes