Issue #77 - Trying to refactor Organization controller.