Clean up and end of iteration 3.
Clean up and end of iteration 3
Merged conflicts for organization.rb