added some files, removed some other files