Add missing files and remove uneeded ones