Merge pull request #537 from KevWright/master

Moved stuff
Updated index file links
Merge pull request #74 from TekHus/index-file

Fixed index file links