refactor Exports structure