Close #6 - Add missing files and remove old files.