Changes for using submodules.
Merge branch 'submodules'