Removed unnecessary TableAndFile class