Refactor Brick\Exporter