clean up and a bit of reneming
more clean up
more code clean up
Revert "clean up and a bit of reneming"

This reverts commit 7f5f7804dd0010d4d0ef7f2315762383c4d79f85.

Conflicts:
	svir/resources/js/svir_viewer_d3_tree.js
all grafical functionality is correct.