code cleanup
code cleanup

Trying to make things more readable and better organized in the src.

Esri/ago-assistant,dmartine/ago-assistant,Esri/ago-assistant,ecaldwell/ago-assistant,nheminger/ago-assistant,dmartine/ago-assistant,nheminger/ago-assistant,ecaldwell/ago-assistant