ordered and corrected schema table classes