Add forgotten exports from main module and start cleaning up.