exporting all modules correctly now