revised structure to export the class directly.