Re-factored module export process