Tidied up folder structure.
Merge branch 'master' of https://github.com/JohnMcCaffery/Chimera