Move all *Context classes from being static/inner classes