significant reordering of code, organizational changes only
Merge pull request #36 from mavenlink/ordering_refactor

significant reordering of code, organizational changes only