Move InfoTable into own class file