#331 Re-arranged order of some functions to make overall program easier to navigate. This will make it harder when combining and refactoring with the ontology view, but I can reorganize that view in a similar fashion prior to refactoring, to make it easier. It also breaks our history a bit.