Merge branch 'master' into development
reorg to new directory naming conventions
Merge branch 'development'