#38 - Install submodules: Reinstall the modules as submodules
#38 fix merge conflict