Changed folder names.
Modified files.
Modified .gitignore.