Remove unneeded files, add missing files