Added initial module loading.
Merge branch 'module-loading'