kind of finished the stuff
some files are deleted