Changed some folder names