Cleanup, exports more conversion tools