I was considering moving those inner classes into their own files. Not sure of the pros/cons of moving them out vs keeping them in are though.