Refactor to break inner classes out into their own files and static
contexts