Remove some old files, add some new ones