re-org for clarity
re-org for clarity

tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal