Changed folder names
Some files deleted