adding context as 1st param to most significant funcs

re-factoring things that have context as or in the name
move some type defs closer to code that uses them (deleting type file)