Remove duplicate files
Add more miscellaneous sources