Changed some class names
Merge branch 'gavschanges'
Split code into separate files and reverted back to Jeff's original
Merge branch 'dev/organization'