Removing incorrect header (should only be in module init files)
Refactoring module export handling