Minor fixes

Changing links, and moving files