minor organization changes
Merge branch 'master' of https://github.com/davidlindenbaum/GHOST-CPP