Fixed duplicate files and tidied up