Try to export modules

So we can remove the import commands and remove the modules.