Refactoring
Merge branch 'master' into Hubert
Merged
Prepared for better module loading
Refactoring
Prepared for better module loading
Merged.