Removed and added some folders and files