Combine UserTable and Table into single class.

A pretty big diff, but mostly automated. The only failure I can think of for something like that that wouldn't be detected as a compilation failure would be where a local variable now shadows a class field because of the name combination (e.g., table and userTable) and both are used in the method.