Changed folder names and removed unnecessary files