Getting rid of bogus files, and adding the table base class.