modified some files and remove some folders