Changed some file/folder names