Organization Branch Merge

Code is now neatly filed away, with each section having its own class.