use the modules directly for now, and export the right stuff