Reworking the database tables and the associated classes to clean up how the data is modeled