updated a few links
merged files