Fix naming of modules so 'dist' works correctly.
rename org for consistency