Readding submodules.
Fixing Makefile for submodules.