Refactoring
Deleted some trash
Merger main.
Load module callback