refactoring of export classes