Merge pull request #2 from Robinlovelace/master

Robin's updates
Restructure
Restructure
Updates
Merge pull request #13 from raoldroyd/master

Updated structure