reorganise export class